ggnfs-commits Mailing List for GGNFS suite

Status: Alpha

Brought to you by: asl__, cmonico

ggnfs-commits — CVS commits announces

You can subscribe to this list here.

2005	Jan	Feb	Mar	Apr	May	Jun (11)	Jul (43)	Aug (688)	Sep (96)	Oct (18)	Nov (17)	Dec (16)
2006	Jan	Feb (18)	Mar (29)	Apr	May (23)	Jun (11)	Jul (46)	Aug (9)	Sep	Oct	Nov	Dec (2)
2007	Jan (2)	Feb	Mar (3)	Apr	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec (19)
2008	Jan (2)	Feb	Mar (1)	Apr (1)	May (1)	Jun (3)	Jul	Aug (1)	Sep (3)	Oct (2)	Nov (2)	Dec (5)
2009	Jan (8)	Feb (3)	Mar (4)	Apr (17)	May	Jun (1)	Jul (1)	Aug (3)	Sep (2)	Oct (2)	Nov (12)	Dec (1)
2010	Jan (1)	Feb	Mar (1)	Apr (1)	May (6)	Jun (3)	Jul (2)	Aug	Sep (1)	Oct (2)	Nov	Dec
2011	Jan (6)	Feb (6)	Mar (1)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct (8)	Nov (1)	Dec (1)
2012	Jan	Feb (3)	Mar	Apr	May	Jun (1)	Jul	Aug (2)	Sep	Oct	Nov	Dec (9)
2013	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec
2016	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

1 2 3 .. 48 > >> (Page 1 of 48)

[Ggnfs-commits] SF.net SVN: ggnfs:[441] trunk/tests/factMsieve.pl

From: <ba...@us...> - 2016-01-11 06:23:44

Revision: 441
          http://sourceforge.net/p/ggnfs/code/441
Author:   batalov
Date:     2016-01-11 06:23:43 +0000 (Mon, 11 Jan 2016)
Log Message:
-----------
minor

Modified Paths:
--------------
    trunk/tests/factMsieve.pl

Modified: trunk/tests/factMsieve.pl
===================================================================
--- trunk/tests/factMsieve.pl	2013-08-27 08:21:13 UTC (rev 440)
+++ trunk/tests/factMsieve.pl	2016-01-11 06:23:43 UTC (rev 441)
@@ -1798,7 +1798,7 @@
   if (/unique relations/) { $rels=$_[9]." ".$_[11]; }
 #  if (/Initial matrix/) { s/\[.*\] Initial matrix is //; $initmat=$_; }
   if (/matrix is/) { $prunedmat=$_[7]." x ".$_[9]; }
-  if (/prp/) {
+  if (/p\d+ factor:/) { # newer Msieve outputs, e.g. "p50", not "prp50"
     s/.*factor: //;
     if ((length($_) > 1) && (length($_) < length($N))) {
       push(@DIVISORS, $_);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[440] trunk/build.vc11

From: <brg...@us...> - 2013-08-27 08:21:18

Revision: 440
          http://sourceforge.net/p/ggnfs/code/440
Author:   brgladman
Date:     2013-08-27 08:21:13 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Minor change to Visual Studio build

Modified Paths:
--------------
    trunk/build.vc11/ggnfslib/ggnfslib.vcxproj
    trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
    trunk/build.vc11/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
    trunk/build.vc11/makefb/makefb.vcxproj
    trunk/build.vc11/matbuild/matbuild.vcxproj
    trunk/build.vc11/matbuild-tpie/matbuild-tpie.vcxproj
    trunk/build.vc11/matprune/matprune.vcxproj
    trunk/build.vc11/matsolve/matsolve.vcxproj
    trunk/build.vc11/pol51m0b/pol51m0b.vcxproj
    trunk/build.vc11/pol51m0bx/pol51m0bx.vcxproj
    trunk/build.vc11/pol51m0n/pol51m0n.vcxproj
    trunk/build.vc11/pol51opt/pol51opt.vcxproj
    trunk/build.vc11/pol51optx/pol51optx.vcxproj
    trunk/build.vc11/polyselect/polyselect.vcxproj
    trunk/build.vc11/procrels/procrels.vcxproj
    trunk/build.vc11/sieve/sieve.vcxproj
    trunk/build.vc11/sqrt/sqrt.vcxproj

Modified: trunk/build.vc11/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc11/ggnfslib/ggnfslib.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/ggnfslib/ggnfslib.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters	2013-08-27 08:21:13 UTC (rev 440)
@@ -117,6 +117,8 @@
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
+    <ClInclude Include="..\..\if.h" />
   </ItemGroup>
   <ItemGroup>
     <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">

Modified: trunk/build.vc11/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc11/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc11/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc11/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc11/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/makefb/makefb.vcxproj
===================================================================
--- trunk/build.vc11/makefb/makefb.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/makefb/makefb.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/matbuild/matbuild.vcxproj
===================================================================
--- trunk/build.vc11/matbuild/matbuild.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/matbuild/matbuild.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/matbuild-tpie/matbuild-tpie.vcxproj
===================================================================
--- trunk/build.vc11/matbuild-tpie/matbuild-tpie.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/matbuild-tpie/matbuild-tpie.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/matprune/matprune.vcxproj
===================================================================
--- trunk/build.vc11/matprune/matprune.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/matprune/matprune.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/matsolve/matsolve.vcxproj
===================================================================
--- trunk/build.vc11/matsolve/matsolve.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/matsolve/matsolve.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/pol51m0b/pol51m0b.vcxproj
===================================================================
--- trunk/build.vc11/pol51m0b/pol51m0b.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/pol51m0b/pol51m0b.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/pol51m0bx/pol51m0bx.vcxproj
===================================================================
--- trunk/build.vc11/pol51m0bx/pol51m0bx.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/pol51m0bx/pol51m0bx.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/pol51m0n/pol51m0n.vcxproj
===================================================================
--- trunk/build.vc11/pol51m0n/pol51m0n.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/pol51m0n/pol51m0n.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/pol51opt/pol51opt.vcxproj
===================================================================
--- trunk/build.vc11/pol51opt/pol51opt.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/pol51opt/pol51opt.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/pol51optx/pol51optx.vcxproj
===================================================================
--- trunk/build.vc11/pol51optx/pol51optx.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/pol51optx/pol51optx.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/polyselect/polyselect.vcxproj
===================================================================
--- trunk/build.vc11/polyselect/polyselect.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/polyselect/polyselect.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/procrels/procrels.vcxproj
===================================================================
--- trunk/build.vc11/procrels/procrels.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/procrels/procrels.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/sieve/sieve.vcxproj
===================================================================
--- trunk/build.vc11/sieve/sieve.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/sieve/sieve.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

Modified: trunk/build.vc11/sqrt/sqrt.vcxproj
===================================================================
--- trunk/build.vc11/sqrt/sqrt.vcxproj	2012-12-08 09:38:28 UTC (rev 439)
+++ trunk/build.vc11/sqrt/sqrt.vcxproj	2013-08-27 08:21:13 UTC (rev 440)
@@ -26,22 +26,26 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>
+    </CharacterSet>
     <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[439] trunk/build.vc11/lasieve.exp/lasieve4I12e

From: <brg...@us...> - 2012-12-08 09:38:34

Revision: 439
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=439&view=rev
Author:   brgladman
Date:     2012-12-08 09:38:28 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
correct build errors in Visual Studio 2012 experimental sieve build

Added Paths:
-----------
    trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj.filters

Removed Paths:
-------------
    trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters

Deleted: trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
+++ trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters	2012-12-08 09:38:28 UTC (rev 439)
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\fnmatch.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\getline.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\getopt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\asprintf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\fnmatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\getline.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\getopt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\unistd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file

Added: trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj.filters	                        (rev 0)
+++ trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj.filters	2012-12-08 09:38:28 UTC (rev 439)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fnmatch.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\getline.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\getopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\asprintf.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\fnmatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\getline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\getopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\unistd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[438] trunk/build.vc11

From: <brg...@us...> - 2012-12-08 09:36:53

Revision: 438
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=438&view=rev
Author:   brgladman
Date:     2012-12-08 09:36:45 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
correct build errors in Visual Studio 2012 experimental sieve build

Modified Paths:
--------------
    trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
    trunk/build.vc11/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieve/liblasieve.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters

Modified: trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2012-12-08 09:36:45 UTC (rev 438)
@@ -108,7 +108,6 @@
       <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -139,7 +138,6 @@
       <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -175,7 +173,6 @@
     </PreBuildEvent>
     <ClCompile>
       <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
@@ -256,9 +253,7 @@
     <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c" />
     <ClCompile Include="..\..\src\lasieve4\input-poly.c" />
     <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c" />
-    <ClCompile Include="..\..\src\lasieve4\mpqs.c">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-    </ClCompile>
+    <ClCompile Include="..\..\src\lasieve4\mpqs.c" />
     <ClCompile Include="..\..\src\lasieve4\prho.c" />
     <ClCompile Include="..\..\src\lasieve4\primgen32.c" />
     <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c" />
@@ -285,60 +280,32 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\lasieve4\piii\basemath.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\lasieve4\piii\lasched.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\lasieve4\piii\medsched.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\lasieve4\piii\psp.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -348,6 +315,8 @@
     <ClInclude Include="..\..\src\if.h" />
     <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
     <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
+    <ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
+    <ClInclude Include="..\..\if.h" />
     <ClInclude Include="..\..\src\lasieve4\lasieve.h" />
     <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
     <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />

Modified: trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2012-12-08 09:36:45 UTC (rev 438)
@@ -100,6 +100,8 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;4101;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>

Modified: trunk/build.vc11/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -100,16 +100,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\32bit.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -100,16 +100,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\32bit.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -100,16 +100,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\32bit.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -100,16 +100,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\32bit.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -100,16 +100,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\32bit.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/liblasieve/liblasieve.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/liblasieve/liblasieve.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/liblasieve/liblasieve.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -55,7 +55,7 @@
     <ClInclude Include="..\..\unistd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -69,7 +69,7 @@
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\mpir.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -11,48 +11,48 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\medsched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\medsched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\search0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\search0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie1A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie1A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie2A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie2A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie3A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie3A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinieG.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinieG.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie2.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie2.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie3.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie3.asm">
       <Filter>Source Files</Filter>
     </YASM>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -60,16 +60,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\if.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -11,48 +11,48 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\medsched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\medsched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\search0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\search0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie1A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie1A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie2A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie2A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie3A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie3A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinieG.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinieG.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie2.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie2.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie3.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie3.asm">
       <Filter>Source Files</Filter>
     </YASM>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -60,16 +60,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\if.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -11,48 +11,48 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\medsched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\medsched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\search0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\search0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie1A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie1A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie2A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie2A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie3A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie3A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinieG.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinieG.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie2.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie2.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie3.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie3.asm">
       <Filter>Source Files</Filter>
     </YASM>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -60,16 +60,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\if.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -11,48 +11,48 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\medsched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\medsched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\search0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\search0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie1A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie1A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie2A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie2A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie3A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie3A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinieG.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinieG.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie2.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie2.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie3.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie3.asm">
       <Filter>Source Files</Filter>
     </YASM>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -60,16 +60,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\if.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc11/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters
===================================================================
--- trunk/build.vc11/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
+++ trunk/build.vc11/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters	2012-12-08 09:36:45 UTC (rev 438)
@@ -11,48 +11,48 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\lasched1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\lasched1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\medsched0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\medsched0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\search0.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\search0.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie1A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie1A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie2A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie2A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinie3A.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinie3A.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\slinieG.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\slinieG.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie1.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie1.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie2.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie2.asm">
       <Filter>Source Files</Filter>
     </YASM>
-    <YASM Include="..\..\..\src\experimental\lasieve4_64\x64\tdslinie3.asm">
+    <YASM Include="..\..\..\src\experimental\lasieve4_64\asm\tdslinie3.asm">
       <Filter>Source Files</Filter>
     </YASM>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.c">
+    <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -60,16 +60,16 @@
     <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\if.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\lasched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\medsched.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\x64\siever-config.h">
+    <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[437] trunk/build.vc10

From: <brg...@us...> - 2012-12-08 09:36:03

Revision: 437
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=437&view=rev
Author:   brgladman
Date:     2012-12-08 09:35:54 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
correct build errors in Visual Studio 2010 experimental sieve build

Modified Paths:
--------------
    trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
    trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
    trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
    trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
    trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
    trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
    trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
    trunk/build.vc10/makefb/makefb.vcxproj.filters
    trunk/build.vc10/matbuild/matbuild.vcxproj.filters
    trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters
    trunk/build.vc10/matprune/matprune.vcxproj.filters
    trunk/build.vc10/matsolve/matsolve.vcxproj.filters
    trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters
    trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters
    trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters
    trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters
    trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters
    trunk/build.vc10/polyselect/polyselect.vcxproj.filters
    trunk/build.vc10/procrels/procrels.vcxproj.filters
    trunk/build.vc10/sieve/sieve.vcxproj.filters
    trunk/build.vc10/sqrt/sqrt.vcxproj.filters

Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -102,7 +102,7 @@
     <ClInclude Include="..\getopt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">
@@ -117,7 +117,7 @@
     <ClInclude Include="..\..\src\lasieve4\lasieve.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\config.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -107,7 +107,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">

Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -107,7 +107,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">

Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -110,7 +110,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -110,7 +110,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -110,7 +110,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -110,7 +110,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -64,9 +64,6 @@
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -82,9 +79,6 @@
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -112,5 +106,11 @@
     <ClInclude Include="..\..\unistd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj	2012-12-08 09:35:54 UTC (rev 437)
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -24,22 +16,11 @@
     <RootNamespace>liblasieveI11</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -50,48 +31,19 @@
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\vsyasm.props" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <YASM>
-      <Defines>I_bits=12</Defines>
-    </YASM>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -110,27 +62,6 @@
       <Defines>I_bits=12</Defines>
     </YASM>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <YASM>
-      <Defines>I_bits=12</Defines>
-    </YASM>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

Modified: trunk/build.vc10/makefb/makefb.vcxproj.filters
===================================================================
--- trunk/build.vc10/makefb/makefb.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/makefb/makefb.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -19,7 +19,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\ggnfs.h">

Modified: trunk/build.vc10/matbuild/matbuild.vcxproj.filters
===================================================================
--- trunk/build.vc10/matbuild/matbuild.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/matbuild/matbuild.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -52,7 +52,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters
===================================================================
--- trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -58,7 +58,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/matprune/matprune.vcxproj.filters
===================================================================
--- trunk/build.vc10/matprune/matprune.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/matprune/matprune.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -34,7 +34,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/matsolve/matsolve.vcxproj.filters
===================================================================
--- trunk/build.vc10/matsolve/matsolve.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/matsolve/matsolve.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -34,7 +34,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -43,7 +43,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -61,7 +61,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -43,7 +43,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -46,7 +46,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -67,7 +67,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/polyselect/polyselect.vcxproj.filters
===================================================================
--- trunk/build.vc10/polyselect/polyselect.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/polyselect/polyselect.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -19,7 +19,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\prand.h">

Modified: trunk/build.vc10/procrels/procrels.vcxproj.filters
===================================================================
--- trunk/build.vc10/procrels/procrels.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/procrels/procrels.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -34,7 +34,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\if.h">

Modified: trunk/build.vc10/sieve/sieve.vcxproj.filters
===================================================================
--- trunk/build.vc10/sieve/sieve.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/sieve/sieve.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -28,7 +28,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\version.h">

Modified: trunk/build.vc10/sqrt/sqrt.vcxproj.filters
===================================================================
--- trunk/build.vc10/sqrt/sqrt.vcxproj.filters	2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/sqrt/sqrt.vcxproj.filters	2012-12-08 09:35:54 UTC (rev 437)
@@ -22,7 +22,7 @@
     <ClInclude Include="..\..\include\ggnfs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\version.h">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[436] trunk/build.vc11

From: <brg...@us...> - 2012-12-07 21:24:42

Revision: 436
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=436&view=rev
Author:   brgladman
Date:     2012-12-07 21:24:35 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Add Visual Studio 2012 build files

Removed Paths:
-------------
    trunk/build.vc11/ggnfs.sdf
    trunk/build.vc11/ggnfs.v11.suo
    trunk/build.vc11/lasieve.exp/lasieve.exp.sdf
    trunk/build.vc11/lasieve.exp/lasieve.exp.v11.suo

Property Changed:
----------------
    trunk/build.vc11/
    trunk/build.vc11/lasieve.exp/


Property changes on: trunk/build.vc11
___________________________________________________________________
Added: svn:ignore
   + ggnfs.sdf
ggnfs.v11.suo


Deleted: trunk/build.vc11/ggnfs.sdf
===================================================================
(Binary files differ)

Deleted: trunk/build.vc11/ggnfs.v11.suo
===================================================================
(Binary files differ)


Property changes on: trunk/build.vc11/lasieve.exp
___________________________________________________________________
Added: svn:ignore
   + lasieve.exp.sdf
lasieve.exp.v11.suo


Deleted: trunk/build.vc11/lasieve.exp/lasieve.exp.sdf
===================================================================
(Binary files differ)

Deleted: trunk/build.vc11/lasieve.exp/lasieve.exp.v11.suo
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[435] trunk

From: <brg...@us...> - 2012-12-07 21:22:10

Revision: 435
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=435&view=rev
Author:   brgladman
Date:     2012-12-07 21:21:57 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Add Visual Studio 2012 build files

Added Paths:
-----------
    trunk/build.vc11/
    trunk/build.vc11/alloca.h
    trunk/build.vc11/asprintf.c
    trunk/build.vc11/asprintf.h
    trunk/build.vc11/file_copy.bat
    trunk/build.vc11/fnmatch.c
    trunk/build.vc11/fnmatch.h
    trunk/build.vc11/getline.c
    trunk/build.vc11/getline.h
    trunk/build.vc11/getopt.c
    trunk/build.vc11/getopt.h
    trunk/build.vc11/ggnfs.sdf
    trunk/build.vc11/ggnfs.sln
    trunk/build.vc11/ggnfs.v11.suo
    trunk/build.vc11/ggnfslib/
    trunk/build.vc11/ggnfslib/ggnfslib.vcxproj
    trunk/build.vc11/ggnfslib/ggnfslib.vcxproj.filters
    trunk/build.vc11/gnfs-lasieve4I11e/
    trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
    trunk/build.vc11/gnfs-lasieve4I12e/
    trunk/build.vc11/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
    trunk/build.vc11/gnfs-lasieve4I13e/
    trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
    trunk/build.vc11/gnfs-lasieve4I14e/
    trunk/build.vc11/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
    trunk/build.vc11/gnfs-lasieve4I15e/
    trunk/build.vc11/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
    trunk/build.vc11/gnfs-lasieve4I16e/
    trunk/build.vc11/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
    trunk/build.vc11/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/
    trunk/build.vc11/lasieve.exp/lasieve.exp.sdf
    trunk/build.vc11/lasieve.exp/lasieve.exp.sln
    trunk/build.vc11/lasieve.exp/lasieve.exp.v11.suo
    trunk/build.vc11/lasieve.exp/lasieve4I11e/
    trunk/build.vc11/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
    trunk/build.vc11/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/lasieve4I12e/
    trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
    trunk/build.vc11/lasieve.exp/lasieve4I13e/
    trunk/build.vc11/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
    trunk/build.vc11/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/lasieve4I14e/
    trunk/build.vc11/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
    trunk/build.vc11/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/lasieve4I15e/
    trunk/build.vc11/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
    trunk/build.vc11/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/lasieve4I16e/
    trunk/build.vc11/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
    trunk/build.vc11/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieve/
    trunk/build.vc11/lasieve.exp/liblasieve/liblasieve.vcxproj
    trunk/build.vc11/lasieve.exp/liblasieve/liblasieve.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI11/
    trunk/build.vc11/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj
    trunk/build.vc11/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI12/
    trunk/build.vc11/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
    trunk/build.vc11/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI13/
    trunk/build.vc11/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
    trunk/build.vc11/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI14/
    trunk/build.vc11/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
    trunk/build.vc11/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI15/
    trunk/build.vc11/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj
    trunk/build.vc11/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters
    trunk/build.vc11/lasieve.exp/liblasieveI16/
    trunk/build.vc11/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj
    trunk/build.vc11/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters
    trunk/build.vc11/lasieve.exp/readme.txt
    trunk/build.vc11/makefb/
    trunk/build.vc11/makefb/makefb.vcxproj
    trunk/build.vc11/makefb/makefb.vcxproj.filters
    trunk/build.vc11/matbuild/
    trunk/build.vc11/matbuild/matbuild.vcxproj
    trunk/build.vc11/matbuild/matbuild.vcxproj.filters
    trunk/build.vc11/matbuild-tpie/
    trunk/build.vc11/matbuild-tpie/matbuild-tpie.vcxproj
    trunk/build.vc11/matbuild-tpie/matbuild-tpie.vcxproj.filters
    trunk/build.vc11/matprune/
    trunk/build.vc11/matprune/matprune.vcxproj
    trunk/build.vc11/matprune/matprune.vcxproj.filters
    trunk/build.vc11/matsolve/
    trunk/build.vc11/matsolve/matsolve.vcxproj
    trunk/build.vc11/matsolve/matsolve.vcxproj.filters
    trunk/build.vc11/modinv1002.c
    trunk/build.vc11/mp_lib.props
    trunk/build.vc11/mulmod32.asm
    trunk/build.vc11/pol51m0b/
    trunk/build.vc11/pol51m0b/pol51m0b.vcxproj
    trunk/build.vc11/pol51m0b/pol51m0b.vcxproj.filters
    trunk/build.vc11/pol51m0bx/
    trunk/build.vc11/pol51m0bx/pol51m0bx.vcxproj
    trunk/build.vc11/pol51m0bx/pol51m0bx.vcxproj.filters
    trunk/build.vc11/pol51m0n/
    trunk/build.vc11/pol51m0n/pol51m0n.vcxproj
    trunk/build.vc11/pol51m0n/pol51m0n.vcxproj.filters
    trunk/build.vc11/pol51opt/
    trunk/build.vc11/pol51opt/pol51opt.vcxproj
    trunk/build.vc11/pol51opt/pol51opt.vcxproj.filters
    trunk/build.vc11/pol51optx/
    trunk/build.vc11/pol51optx/pol51optx.vcxproj
    trunk/build.vc11/pol51optx/pol51optx.vcxproj.filters
    trunk/build.vc11/polyselect/
    trunk/build.vc11/polyselect/polyselect.vcxproj
    trunk/build.vc11/polyselect/polyselect.vcxproj.filters
    trunk/build.vc11/procrels/
    trunk/build.vc11/procrels/procrels.vcxproj
    trunk/build.vc11/procrels/procrels.vcxproj.filters
    trunk/build.vc11/rint.c
    trunk/build.vc11/rint.h
    trunk/build.vc11/run.bat
    trunk/build.vc11/sieve/
    trunk/build.vc11/sieve/sieve.vcxproj
    trunk/build.vc11/sieve/sieve.vcxproj.filters
    trunk/build.vc11/sqrt/
    trunk/build.vc11/sqrt/sqrt.vcxproj
    trunk/build.vc11/sqrt/sqrt.vcxproj.filters
    trunk/build.vc11/unistd.h
    trunk/build.vc11/vasprintf.c
    trunk/build.vc11/vsyasm.props
    trunk/build.vc11/vsyasm.targets
    trunk/build.vc11/vsyasm.xml

Added: trunk/build.vc11/alloca.h
===================================================================
--- trunk/build.vc11/alloca.h	                        (rev 0)
+++ trunk/build.vc11/alloca.h	2012-12-07 21:21:57 UTC (rev 435)
@@ -0,0 +1,7 @@
+
+#ifndef ALLOCA_H
+#define ALLOCA_H
+
+#define alloca _alloca
+
+#endif
\ No newline at end of file

Added: trunk/build.vc11/asprintf.c
===================================================================
--- trunk/build.vc11/asprintf.c	                        (rev 0)
+++ trunk/build.vc11/asprintf.c	2012-12-07 21:21:57 UTC (rev 435)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2007, The xFTPd Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *     * Neither the name of the xFTPd Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *     * Redistributions of this project or parts of this project in any form
+ *       must retain the following aknowledgment:
+ *       "This product includes software developed by the xFTPd Project.
+ *        http://www.xftpd.com/ - http://www.xftpd.org/"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE xFTPd PROJECT ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE xFTPd PROJECT BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+/* MinGW lacks asprintf */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+int vasprintf(char **strp, const char *fmt, va_list ap)
+{
+  FILE *dev_null;
+  int arg_len;
+  
+  dev_null = fopen("nul", "w");
+  arg_len = vfprintf(dev_null, fmt, ap);
+  if(arg_len != -1) {
+    *strp = (char *)malloc((size_t)arg_len + 1);
+    arg_len = vsprintf(*strp, fmt, ap);
+  } else *strp = NULL;
+  fclose(dev_null);
+  return arg_len;
+}
+
+int asprintf(char **strp, const char *fmt, ...)
+{
+  int result;
+    
+  va_list args;
+  va_start(args, fmt);
+  result = vasprintf(strp, fmt, args);
+  va_end(args);
+  return result;
+}

Added: trunk/build.vc11/asprintf.h
===================================================================
--- trunk/build.vc11/asprintf.h	                        (rev 0)
+++ trunk/build.vc11/asprintf.h	2012-12-07 21:21:57 UTC (rev 435)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, The xFTPd Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *     * Neither the name of the xFTPd Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *     * Redistributions of this project or parts of this project in any form
+ *       must retain the following aknowledgment:
+ *       "This product includes software developed by the xFTPd Project.
+ *        http://www.xftpd.com/ - http://www.xftpd.org/"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE xFTPd PROJECT ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE xFTPd PROJECT BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* MinGW lacks asprintf */
+
+#ifndef __ASPRINTF_H
+#define __ASPRINTF_H
+
+#include <windows.h>
+
+int asprintf(char **ret, const char *fmt, ...);
+int vasprintf(char **strp, const char *fmt, va_list ap);
+
+char *bprintf(const char *fmt, ...);
+
+#endif /* __ASPRINTF_H */

Added: trunk/build.vc11/file_copy.bat
===================================================================
--- trunk/build.vc11/file_copy.bat	                        (rev 0)
+++ trunk/build.vc11/file_copy.bat	2012-12-07 21:21:57 UTC (rev 435)
@@ -0,0 +1,8 @@
+if not exist %1 goto exit
+if not exist %2 goto copy
+fc %1 %2 > nul
+if not %errorlevel 1 goto exit
+:copy
+echo copying %1 to %2 
+copy %1 %2
+:exit

Added: trunk/build.vc11/fnmatch.c
===================================================================
--- trunk/build.vc11/fnmatch.c	                        (rev 0)
+++ trunk/build.vc11/fnmatch.c	2012-12-07 21:21:57 UTC (rev 435)
@@ -0,0 +1,209 @@
+/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug...@pr....
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
+#include <errno.h>
+#include <fnmatch.h>
+#include <ctype.h>
+
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
+
+
+#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
+extern int errno;
+#endif
+
+/* Match STRING against the filename pattern PATTERN, returning zero if
+   it matches, nonzero if not.  */
+int
+fnmatch (pattern, string, flags)
+     const char *pattern;
+     const char *string;
+     int flags;
+{
+  register const char *p = pattern, *n = string;
+  register char c;
+
+/* Note that this evalutes C many times.  */
+#define FOLD(c)	((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c))
+
+  while ((c = *p++) != '\0')
+    {
+      c = FOLD (c);
+
+      switch (c)
+	{
+	case '?':
+	  if (*n == '\0')
+	    return FNM_NOMATCH;
+	  else if ((flags & FNM_FILE_NAME) && *n == '/')
+	    return FNM_NOMATCH;
+	  else if ((flags & FNM_PERIOD) && *n == '.' &&
+		   (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
+	    return FNM_NOMATCH;
+	  break;
+
+	case '\\':
+	  if (!(flags & FNM_NOESCAPE))
+	    {
+	      c = *p++;
+	      c = FOLD (c);
+	    }
+	  if (FOLD (*n) != c)
+	    return FNM_NOMATCH;
+	  break;
+
+	case '*':
+	  if ((flags & FNM_PERIOD) && *n == '.' &&
+	      (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
+	    return FNM_NOMATCH;
+
+	  for (c = *p++; c == '?' || c == '*'; c = *p++, ++n)
+	    if (((flags & FNM_FILE_NAME) && *n == '/') ||
+		(c == '?' && *n == '\0'))
+	      return FNM_NOMATCH;
+
+	  if (c == '\0')
+	    return 0;
+
+	  {
+	    char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c;
+	    c1 = FOLD (c1);
+	    for (--p; *n != '\0'; ++n)
+	      if ((c == '[' || FOLD (*n) == c1) &&
+		  fnmatch (p, n, flags & ~FNM_PERIOD) == 0)
+		return 0;
+	    return FNM_NOMATCH;
+	  }
+
+	case '[':
+	  {
+	    /* Nonzero if the sense of the character class is inverted.  */
+	    register int not;
+
+	    if (*n == '\0')
+	      return FNM_NOMATCH;
+
+	    if ((flags & FNM_PERIOD) && *n == '.' &&
+		(n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
+	      return FNM_NOMATCH;
+
+	    not = (*p == '!' || *p == '^');
+	    if (not)
+	      ++p;
+
+	    c = *p++;
+	    for (;;)
+	      {
+		register char cstart = c, cend = c;
+
+		if (!(flags & FNM_NOESCAPE) && c == '\\')
+		  cstart = cend = *p++;
+
+		cstart = cend = FOLD (cstart);
+
+		if (c == '\0')
+		  /* [ (unterminated) loses.  */
+		  return FNM_NOMATCH;
+
+		c = *p++;
+		c = FOLD (c);
+
+		if ((flags & FNM_FILE_NAME) && c == '/')
+		  /* [/] can never match.  */
+		  return FNM_NOMATCH;
+
+		if (c == '-' && *p != ']')
+		  {
+		    cend = *p++;
+		    if (!(flags & FNM_NOESCAPE) && cend == '\\')
+		      cend = *p++;
+		    if (cend == '\0')
+		      return FNM_NOMATCH;
+		    cend = FOLD (cend);
+
+		    c = *p++;
+		  }
+
+		if (FOLD (*n) >= cstart && FOLD (*n) <= cend)
+		  goto matched;
+
+		if (c == ']')
+		  break;
+	      }
+	    if (!not)
+	      return FNM_NOMATCH;
+	    break;
+
+	  matched:;
+	    /* Skip the rest of the [...] that already matched.  */
+	    while (c != ']')
+	      {
+		if (c == '\0')
+		  /* [... (unterminated) loses.  */
+		  return FNM_NOMATCH;
+
+		c = *p++;
+		if (!(flags & FNM_NOESCAPE) && c == '\\')
+		  /* XXX 1003.2d11 is unclear if this is right.  */
+		  ++p;
+	      }
+	    if (not)
+	      return FNM_NOMATCH;
+	  }
+	  break;
+
+	default:
+	  if (c != FOLD (*n))
+	    return FNM_NOMATCH;
+	}
+
+      ++n;
+    }
+
+  if (*n == '\0')
+    return 0;
+
+  if ((flags & FNM_LEADING_DIR) && *n == '/')
+    /* The FNM_LEADING_DIR flag says that "foo*" matches "foobar/frobozz".  */
+    return 0;
+
+  return FNM_NOMATCH;
+}
+
+#endif	/* _LIBC or not __GNU_LIBRARY__.  */

Added: trunk/build.vc11/fnmatch.h
===================================================================
--- trunk/build.vc11/fnmatch.h	                        (rev 0)
+++ trunk/build.vc11/fnmatch.h	2012-12-07 21:21:57 UTC (rev 435)
@@ -0,0 +1,69 @@
+/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug...@pr....
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#ifndef	_FNMATCH_H
+
+#define	_FNMATCH_H	1
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
+#undef	__P
+#define	__P(args)	args
+#else /* Not C++ or ANSI C.  */
+#undef	__P
+#define	__P(args)	()
+/* We can get away without defining `const' here only because in this file
+   it is used only inside the prototype for `fnmatch', which is elided in
+   non-ANSI C where `const' is problematical.  */
+#endif /* C++ or ANSI C.  */
+
+
+/* We #undef these before defining them because some losing systems
+   (HP-UX A.08.07 for example) define these in <unistd.h>.  */
+#undef	FNM_PATHNAME
+#undef	FNM_NOESCAPE
+#undef	FNM_PERIOD
+
+/* Bits set in the FLAGS argument to `fnmatch'.  */
+#define	FNM_PATHNAME	(1 << 0) /* No wildcard can ever match `/'.  */
+#define	FNM_NOESCAPE	(1 << 1) /* Backslashes don't quote special chars.  */
+#define	FNM_PERIOD	(1 << 2) /* Leading `.' is matched only explicitly.  */
+
+#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE)
+#define	FNM_FILE_NAME	FNM_PATHNAME /* Preferred GNU name.  */
+#define	FNM_LEADING_DIR	(1 << 3) /* Ignore `/...' after a match.  */
+#define	FNM_CASEFOLD	(1 << 4) /* Compare without regard to case.  */
+#endif
+
+/* Value returned by `fnmatch' if STRING does not match PATTERN.  */
+#define	FNM_NOMATCH	1
+
+/* Match STRING against the filename pattern PATTERN,
+   returning zero if it matches, FNM_NOMATCH if not.  */
+extern int fnmatch __P ((const char *__pattern, const char *__string,
+			 int __flags));
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* fnmatch.h */

Added: trunk/build.vc11/getline.c
===================================================================
--- trunk/build.vc11/getline.c	                        (rev 0)
+++ trunk/build.vc11/getline.c	2012-12-07 21:21:57 UTC (rev 435)
@@ -0,0 +1,159 @@
+/*
+getline.c -- Replacement for GNU C library function getline
+
+Copyright (C) 1993 Free Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.  */
+
+/* Written by Jan Brittenson, bs...@gn....  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <assert.h>
+#include <errno.h>
+#include "getline.h"
+
+#if STDC_HEADERS
+#include <stdlib.h>
+#else
+char *malloc (), *realloc ();
+#endif
+
+/* Always add at least this many bytes when extending the buffer.  */
+#define MIN_CHUNK 64
+
+/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
+   + OFFSET (and null-terminate it).  If LIMIT is non-negative, then
+   read no more than LIMIT chars.
+ 
+   *LINEPTR is a pointer returned from malloc (or NULL), pointing to
+   *N characters of space.  It is realloc'd as necessary.  
+ 
+   Return the number of characters read (not including the null
+   terminator), or -1 on error or EOF.  On a -1 return, the caller
+   should check feof(), if not then errno has been set to indicate the
+   error.  */
+
+int getstr (char **lineptr, size_t *n, FILE *stream, int terminator, int offset, int limit)
+{
+    int nchars_avail;  /* Allocated but unused chars in *LINEPTR.  */
+    char *read_pos;  /* Where we're reading into *LINEPTR. */
+    int ret;
+
+    if (!lineptr || !n || !stream)
+    {
+        errno = EINVAL;
+        return -1;
+    }
+
+    if (!*lineptr)
+    {
+        *n = MIN_CHUNK;
+        *lineptr = malloc (*n);
+        if (!*lineptr)
+        {
+            errno = ENOMEM;
+            return -1;
+        }
+        *lineptr[0] = '\0';
+    }
+
+    nchars_avail = *n - offset;
+    read_pos = *lineptr + offset;
+
+    for (;;)
+    {
+        int save_errno;
+        register int c;
+
+        if (limit == 0)
+            break;
+        else
+        {
+            c = getc (stream);
+
+            /* If limit is negative, then we shouldn't pay attention to
+               it, so decrement only if positive. */
+            if (limit > 0)
+                limit--;
+        }
+
+        save_errno = errno;
+
+        /* We always want at least one char left in the buffer, since we
+        always (unless we get an error while reading the first char)
+        NUL-terminate the line buffer.  */
+
+        assert((*lineptr + *n) == (read_pos + nchars_avail));
+        if (nchars_avail < 2)
+        {
+            if (*n > MIN_CHUNK)
+                *n *= 2;
+            else
+                *n += MIN_CHUNK;
+
+            nchars_avail = *n + *lineptr - read_pos;
+            *lineptr = realloc (*lineptr, *n);
+            if (!*lineptr)
+            {
+                errno = ENOMEM;
+                return -1;
+            }
+            read_pos = *n - nchars_avail + *lineptr;
+            assert((*lineptr + *n) == (read_pos + nchars_avail));
+        }
+
+        if (ferror (stream))
+        {
+            /* Might like to return partial line, but there is no
+               place for us to store errno.  And we don't want to just
+               lose errno.  */
+            errno = save_errno;
+            return -1;
+        }
+
+        if (c == EOF)
+        {
+            /* Return partial line, if any.  */
+            if (read_pos == *lineptr)
+                return -1;
+            else
+                break;
+        }
+
+        *read_pos++ = c;
+        nchars_avail--;
+
+        if (c == terminator)
+            /* Return the line.  */
+            break;
+    }
+
+    /* Done - NUL terminate and return the number of chars read.  */
+    *read_pos = '\0';
+
+    ret = read_pos - (*lineptr + offset);
+    return ret;
+}
+
+int getline (char **lineptr, size_t *n, FILE *stream)
+{
+    return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT);
+}
+
+int getline_safe (char **lineptr, size_t *n, FILE *stream, int limit)
+{
+    return getstr (lineptr, n, stream, '\n', 0, limit);
+}

Added: trunk/build.vc11/getline.h
===================================================================
--- trunk/build.vc11/getline.h	                        (rev 0)
+++ trunk/build.vc11/getline.h	2012-12-07 21:21:57 UTC (rev 435)
@@ -0,0 +1,25 @@
+
+#ifndef _getline_h_
+#define _getline_h_ 1
+
+#include <stdio.h>
+
+#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+#define __PROTO(args) args
+#else
+#define __PROTO(args) ()
+#endif  /* GCC.  */
+
+#define GETLINE_NO_LIMIT -1
+
+int
+  getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
+int
+  getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+                         int limit));
+int
+  getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+		   int _terminator, int _offset, int limit));
+
+#endif /* _getline_h_ */
+

Added: trunk/build.vc11/getopt.c
===================================================================
--- trunk/build.vc11/getopt.c	                        (rev 0)
+++ trunk/build.vc11/getopt.c	2012-12-07 21:21:57 UTC (rev 435)
@@ -0,0 +1,1281 @@
+/* Getopt for GNU.
+   NOTE: getopt is now part of the C library, so if you don't know what
+   "Keep this file name-space clean" means, talk to dr...@gn...
+   before changing it!
+   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002
+   	Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+   Ditto for AIX 3.2 and <stdlib.h>.  */
+
+#define HAVE_STRING_H	1
+
+#ifndef _NO_PROTO
+# define _NO_PROTO
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if !defined __STDC__ || !__STDC__
+/* This is a separate conditional since some stdc systems
+   reject `defined (const)'.  */
+# ifndef const
+#  define const
+# endif
+#endif
+
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+# include <gnu-versions.h>
+# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#  define ELIDE_CODE
+# endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef	__GNU_LIBRARY__
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+   contain conflicting prototypes for getopt.  */
+# include <stdlib.h>
+# include <unistd.h>
+#endif	/* GNU C library.  */
+
+#ifdef VMS
+# include <unixlib.h>
+# if HAVE_STRING_H - 0
+#  include <string.h>
+# endif
+#endif
+
+#ifndef _
+/* This is for other GNU distributions with internationalized messages.  */
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
+#  include <libintl.h>
+#  ifndef _
+#   define _(msgid)	gettext (msgid)
+#  endif
+# else
+#  define _(msgid)	(msgid)
+# endif
+# if defined _LIBC && defined USE_IN_LIBIO
+#  include <wchar.h>
+# endif
+#endif
+
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+   but it behaves differently for the user, since it allows the user
+   to intersperse the options with the other arguments.
+
+   As `getopt' works, it permutes the elements of ARGV so that,
+   when it is done, all the options precede everything else.  Thus
+   all application programs are extended to handle flexible argument order.
+
+   Setting the environment variable POSIXLY_CORRECT disables permutation.
+   Then the behavior is completely standard.
+
+   GNU application programs can use a third alternative mode in which
+   they can distinguish the relative order of options and other arguments.  */
+
+#include "getopt.h"
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+/* 1003.2 says this must be 1 before any call.  */
+int optind = 1;
+
+/* Formerly, initialization of getopt depended on optind==0, which
+   causes problems with re-calling getopt as programs generally don't
+   know that. */
+
+int __getopt_initialized attribute_hidden;
+
+/* The next char to be scanned in the option-element
+   in which the last option character we returned was found.
+   This allows us to pick up the scan where we left off.
+
+   If this is zero, or a null string, it means resume the scan
+   by advancing to the next ARGV-element.  */
+
+static char *nextchar;
+
+/* Callers store zero here to inhibit the error message
+   for unrecognized options.  */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+   This must be initialized on some systems to avoid linking in the
+   system's own getopt implementation.  */
+
+int optopt = '?';
+
+/* Describe how to deal with options that follow non-option ARGV-elements.
+
+   If the caller did not specify anything,
+   the default is REQUIRE_ORDER if the environment variable
+   POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+   REQUIRE_ORDER means don't recognize them as options;
+   stop option processing when the first non-option is seen.
+   This is what Unix does.
+   This mode of operation is selected by either setting the environment
+   variable POSIXLY_CORRECT, or using `+' as the first character
+   of the list of option characters.
+
+   PERMUTE is the default.  We permute the contents of ARGV as we scan,
+   so that eventually all the non-options are at the end.  This allows options
+   to be given in any order, even with programs that were not written to
+   expect this.
+
+   RETURN_IN_ORDER is an option available to programs that were written
+   to expect options and other ARGV-elements in any order and that care about
+   the ordering of the two.  We describe each non-option ARGV-element
+   as if it were the argument of an option with character code 1.
+   Using `-' as the first character of the list of option characters
+   selects this mode of operation.
+
+   The special argument `--' forces an end of option-scanning regardless
+   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+
+static enum
+{
+  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+} ordering;
+
+/* Value of POSIXLY_CORRECT environment variable.  */
+static char *posixly_correct;
+
+#ifdef	__GNU_LIBRARY__
+/* We want to avoid inclusion of string.h with non-GNU libraries
+   because there are many ways it can cause trouble.
+   On some systems, it contains special magic macros that don't work
+   in GCC.  */
+# include <string.h>
+# define my_index	strchr
+#else
+
+# if HAVE_STRING_H
+#  include <string.h>
+# else
+#  include <strings.h>
+# endif
+
+/* Avoid depending on library functions or files
+   whose names are inconsistent.  */
+
+#ifndef getenv
+extern char *getenv ();
+#endif
+
+static char *
+my_index (str, chr)
+     const char *str;
+     int chr;
+{
+  while (*str)
+    {
+      if (*str == chr)
+	return (char *) str;
+      str++;
+    }
+  return 0;
+}
+
+/* If using GCC, we can safely declare strlen this way.
+   If not using GCC, it is ok not to declare it.  */
+#ifdef __GNUC__
+/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+   That was relevant to code that was here before.  */
+# if (!defined __STDC__ || !__STDC__) && !defined strlen
+/* gcc with -traditional declares the built-in strlen to return int,
+   and has done so at least since version 2.4.5. -- rms.  */
+extern int strlen (const char *);
+# endif /* not __STDC__ */
+#endif /* __GNUC__ */
+
+#endif /* not __GNU_LIBRARY__ */
+
+/* Handle permutation of arguments.  */
+
+/* Describe the part of ARGV that contains non-options that have
+   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
+   `last_nonopt' is the index after the last of them.  */
+
+static int first_nonopt;
+static int last_nonopt;
+
+#ifdef _LIBC
+/* Stored original parameters.
+   XXX This is no good solution.  We should rather copy the args so
+   that we can compare them later.  But we must not use malloc(3).  */
+extern int __libc_argc;
+extern char **__libc_argv;
+
+/* Bash 2.0 gives us an environment variable containing flags
+   indicating ARGV elements that should not be considered arguments.  */
+
+# ifdef USE_NONOPTION_FLAGS
+/* Defined in getopt_init.c  */
+extern char *__getopt_nonoption_flags;
+
+static int nonoption_flags_max_len;
+static int nonoption_flags_len;
+# endif
+
+# ifdef USE_NONOPTION_FLAGS
+#  define SWAP_FLAGS(ch1, ch2) \
+  if (nonoption_flags_len > 0)						      \
+    {									      \
+      char __tmp = __getopt_nonoption_flags[ch1];			      \
+      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
+      __getopt_nonoption_flags[ch2] = __tmp;				      \
+    }
+# else
+#  define SWAP_FLAGS(ch1, ch2)
+# endif
+#else	/* !_LIBC */
+# define SWAP_FLAGS(ch1, ch2)
+#endif	/* _LIBC */
+
+/* Exchange two adjacent subsequences of ARGV.
+   One subsequence is elements [first_nonopt,last_nonopt)
+   which contains all the non-options that have been skipped so far.
+   The other is elements [last_nonopt,optind), which contains all
+   the options processed since those non-options were skipped.
+
+   `first_nonopt' and `last_nonopt' are relocated so that they describe
+   the new indices of the non-options in ARGV after they are moved.  */
+
+#if defined __STDC__ && __STDC__
+static void exchange (char **);
+#endif
+
+static void
+exchange (argv)
+     char **argv;
+{
+  int bottom = first_nonopt;
+  int middle = last_nonopt;
+  int top = optind;
+  char *tem;
+
+  /* Exchange the shorter segment with the far end of the longer segment.
+     That puts the shorter segment into the right place.
+     It leaves the longer segment in the right place overall,
+     but it consists of two parts that need to be swapped next.  */
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  /* First make sure the handling of the `__getopt_nonoption_flags'
+     string can work normally.  Our top argument must be in the range
+     of the string.  */
+  if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
+    {
+      /* We must extend the array.  The user plays games with us and
+	 presents new arguments.  */
+      char *new_str = malloc (top + 1);
+      if (new_str == NULL)
+	nonoption_flags_len = nonoption_flags_max_len = 0;
+      else
+	{
+	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
+			     nonoption_flags_max_len),
+		  '\0', top + 1 - nonoption_flags_max_len);
+	  nonoption_flags_max_len = top + 1;
+	  __getopt_nonoption_flags = new_str;
+	}
+    }
+#endif
+
+  while (top > middle && middle > bottom)
+    {
+      if (top - middle > middle - bottom)
+	{
+	  /* Bottom segment is the short one.  */
+	  int len = middle - bottom;
+	  register int i;
+
+	  /* Swap it with the top part of the top segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[top - (middle - bottom) + i];
+	      argv[top - (middle - bottom) + i] = tem;
+	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+	    }
+	  /* Exclude the moved bottom segment from further swapping.  */
+	  top -= len;
+	}
+      else
+	{
+	  /* Top segment is the short one.  */
+	  int len = top - middle;
+	  register int i;
+
+	  /* Swap it with the bottom part of the bottom segment.  */
+	  for (i = 0; i < len; i++)
+	    {
+	      tem = argv[bottom + i];
+	      argv[bottom + i] = argv[middle + i];
+	      argv[middle + i] = tem;
+	      SWAP_FLAGS (bottom + i, middle + i);
+	    }
+	  /* Exclude the moved top segment from further swapping.  */
+	  bottom += len;
+	}
+    }
+
+  /* Update records for the slots the non-options now occupy.  */
+
+  first_nonopt += (optind - last_nonopt);
+  last_nonopt = optind;
+}
+
+/* Initialize the internal data when the first call is made.  */
+
+#if defined __STDC__ && __STDC__
+static const char *_getopt_initialize (int, char *const *, const char *);
+#endif
+static const char *
+_getopt_initialize (argc, argv, optstring)
+     int argc;
+     char *const *argv;
+     const char *optstring;
+{
+  /* Start processing options with ARGV-element 1 (since ARGV-element 0
+     is the program name); the sequence of previously skipped
+     non-option ARGV-elements is empty.  */
+
+  first_nonopt = last_nonopt = optind;
+
+  nextchar = NULL;
+
+  posixly_correct = getenv ("POSIXLY_CORRECT");
+
+  /* Determine how to handle the ordering of options and nonoptions.  */
+
+  if (optstring[0] == '-')
+    {
+      ordering = RETURN_IN_ORDER;
+      ++optstring;
+    }
+  else if (optstring[0] == '+')
+    {
+      ordering = REQUIRE_ORDER;
+      ++optstring;
+    }
+  else if (posixly_correct != NULL)
+    ordering = REQUIRE_ORDER;
+  else
+    ordering = PERMUTE;
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  if (posixly_correct == NULL
+      && argc == __libc_argc && argv == __libc_argv)
+    {
+      if (nonoption_flags_max_len == 0)
+	{
+	  if (__getopt_nonoption_flags == NULL
+	      || __getopt_nonoption_flags[0] == '\0')
+	    nonoption_flags_max_len = -1;
+	  else
+	    {
+	      const char *orig_str = __getopt_nonoption_flags;
+	      int len = nonoption_flags_max_len = strlen (orig_str);
+	      if (nonoption_flags_max_len < argc)
+		nonoption_flags_max_len = argc;
+	      __getopt_nonoption_flags =
+		(char *) malloc (nonoption_flags_max_len);
+	      if (__getopt_nonoption_flags == NULL)
+		nonoption_flags_max_len = -1;
+	      else
+		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+			'\0', nonoption_flags_max_len - len);
+	    }
+	}
+      nonoption_flags_len = nonoption_flags_max_len;
+    }
+  else
+    nonoption_flags_len = 0;
+#endif
+
+  return optstring;
+}
+
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+   given in OPTSTRING.
+
+   If an element of ARGV starts with '-', and is not exactly "-" or "--",
+   then it is an option element.  The characters of this element
+   (aside from the initial '-') are option characters.  If `getopt'
+   is called repeatedly, it returns successively each of the option characters
+   from each of the option elements.
+
+   If `getopt' finds another option character, it returns that character,
+   updating `optind' and `nextchar' so that the next call to `getopt' can
+   resume the scan with the following option character or ARGV-element.
+
+   If there are no more option characters, `getopt' returns -1.
+   Then `optind' is the index in ARGV of the first ARGV-element
+   that is not an option.  (The ARGV-elements have been permuted
+   so that those that are not options now come last.)
+
+   OPTSTRING is a string containing the legitimate option characters.
+   If an option character is seen that is not listed in OPTSTRING,
+   return '?' after printing an error message.  If you set `opterr' to
+   zero, the error message is suppressed but we still return '?'.
+
+   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+   so the following text in the same ARGV-element, or the text of the following
+   ARGV-element, is returned in `optarg'.  Two colons mean an option that
+   wants an optional arg; if there is text in the current ARGV-element,
+   it is returned in `optarg', otherwise `optarg' is set to zero.
+
+   If OPTSTRING starts with `-' or `+', it requests different methods of
+   handling the non-option ARGV-elements.
+   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+
+   Long-named options begin with `--' instead of `-'.
+   Their names may be abbreviated as long as the abbreviation is unique
+   or is an exact match for some defined option.  If they have an
+   argument, it follows the option name in the same ARGV-element, separated
+   from the option name by a `=', or else the in next ARGV-element.
+   When `getopt' finds a long-named option, it returns 0 if that option's
+   `flag' field is nonzero, the value of the option's `val' field
+   if the `flag' field is zero.
+
+   The elements of ARGV aren't really const, because we permute them.
+   But we pretend they're const in the prototype to be compatible
+   with other systems.
+
+   LONGOPTS is a vector of `struct option' terminated by an
+   element containing a name which is zero.
+
+   LONGIND returns the index in LONGOPT of the long-named option found.
+   It is only valid when a long-named option has been found by the most
+   recent call.
+
+   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+   long-named options.  */
+
+int
+_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
+     int argc;
+     char *const *argv;
+     const char *optstring;
+     const struct option *longopts;
+     int *longind;
+     int long_only;
+{
+  int print_errors = opterr;
+  if (optstring[0] == ':')
+    print_errors = 0;
+
+  if (argc < 1)
+    return -1;
+
+  optarg = NULL;
+
+  if (optind == 0 || !__getopt_initialized)
+    {
+      if (optind == 0)
+	optind = 1;	/* Don't scan ARGV[0], the program name.  */
+      optstring = _getopt_initialize (argc, argv, optstring);
+      __getopt_initialized = 1;
+    }
+
+  /* Test whether ARGV[optind] points to a non-option argument.
+     Either it does not have option syntax, or there is an environment flag
+     from the shell indicating it is not an option.  The later information
+     is only used when the used in the GNU libc.  */
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
+		      || (optind < nonoption_flags_len			      \
+			  && __getopt_nonoption_flags[optind] == '1'))
+#else
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#endif
+
+  if (nextchar == NULL || *nextchar == '\0')
+    {
+      /* Advance to the next ARGV-element.  */
+
+      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+	 moved back by the user (who may also have changed the arguments).  */
+      if (last_nonopt > optind)
+	last_nonopt = optind;
+      if (first_nonopt > optind)
+	first_nonopt = optind;
+
+      if (ordering == PERMUTE)
+	{
+	  /* If we have just processed some options following some non-options,
+	     exchange them so that the options come first.  */
+
+	  if (first_nonopt != last_nonopt && last_nonopt != optind)
+	    exchange ((char **) argv);
+	  else if (last_nonopt != optind)
+	    first_nonopt = optind;
+
+	  /* Skip any additional non-options
+	     and extend the range of non-options previously skipped.  */
+
+	  while (optind < argc && NONOPTION_P)
+	    optind++;
+	  last_nonopt = optind;
+	}
+
+      /* The special ARGV-element `--' means premature end of options.
+	 Skip it like a null option,
+	 then exchange with previous non-options as if it were an option,
+	 then skip everything else like a non-option.  */
+
+      if (optind != argc && !strcmp (argv[optind], "--"))
+	{
+	  optind++;
+
+	  if (first_nonopt != last_nonopt && last_nonopt != optind)
+	    exchange ((char **) argv);
+	  else if (first_nonopt == last_nonopt)
+	    first_nonopt = optind;
+	  last_nonopt = argc;
+
+	  optind = argc;
+	}
+
+      /* If we have done all the ARGV-elements, stop the scan
+	 and back over any non-options that we skipped and permuted.  */
+
+      if (optind == argc)
+	{
+	  /* Set the next-arg-index to point at the non-options
+	     that we previously skipped, so the caller will digest them.  */
+	  if (first_nonopt != last_nonopt)
+	    optind = first_nonopt;
+	  return -1;
+	}
+
+      /* If we have come to a non-option and did not permute it,
+	 either stop the scan or describe it to the caller and pass it by.  */
+
+      if (NONOPTION_P)
+	{
+	  if (ordering == REQUIRE_ORDER)
+	    return -1;
+	  optarg = argv[optind++];
+	  return 1;
+	}
+
+      /* We have found another option-ARGV-element.
+	 Skip the initial punctuation.  */
+
+      nextchar = (argv[optind] + 1
+		  + (longopts != NULL && argv[optind][1] == '-'));
+    }
+
+  /* Decode the current option-ARGV-element.  */
+
+  /* Check whether the ARGV-element is a long option.
+
+     If long_only and the ARGV-element has the form "-f", where f is
+     a valid short option, don't consider it an abbreviated form of
+     a long option that starts with f.  Otherwise there would be no
+     way to give the -f short option.
+
+     On the other hand, if there's a long option "fubar" and
+     the ARGV-element is "-fu", do consider that an abbreviation of
+     the long option, just like "--fu", and not "-f" with arg "u".
+
+     This distinction seems to be the most useful approach.  */
+
+  if (longopts != NULL
+      && (argv[optind][1] == '-'
+	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
+    {
+      char *nameend;
+      const struct option *p;
+      const struct option *pfound = NULL;
+      int exact = 0;
+      int ambig = 0;
+      int indfound = -1;
+      int option_index;
+
+      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
+	/* Do nothing.  */ ;
+
+      /* Test all long options for either exact match
+	 or abbreviated matches.  */
+      for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	if (!strncmp (p->name, nextchar, nameend - nextchar))
+	  {
+	    if ((unsigned int) (nameend - nextchar)
+		== (unsigned int) strlen (p->name))
+	      {
+		/* Exact match found.  */
+		pfound = p;
+		indfound = option_index;
+		exact = 1;
+		break;
+	      }
+	    else if (pfound == NULL)
+	      {
+		/* First nonexact match found.  */
+		pfound = p;
+		indfound = option_index;
+	      }
+	    else if (long_only
+		     || pfound->has_arg != p->has_arg
+		     || pfound->flag != p->flag
+		     || pfound->val != p->val)
+	      /* Second or later nonexact match found.  */
+	      ambig = 1;
+	  }
+
+      if (ambig && !exact)
+	{
+	  if (print_errors)
+	    {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+
+	      if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
+			      argv[0], argv[optind]) >= 0)
+		{
+
+		  if (_IO_fwide (stderr, 0) > 0)
+		    __fwprintf (stderr, L"%s", buf);
+		  else
+		    fputs (buf, stderr);
+
+		  free (buf);
+		}
+#else
+	      fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+		       argv[0], argv[optind]);
+#endif
+	    }
+	  nextchar += strlen (nextchar);
+	  optind++;
+	  optopt = 0;
+	  return '?';
+	}
+
+      if (pfound != NULL)
+	{
+	  option_index = indfound;
+	  optind++;
+	  if (*nameend)
+	    {
+	      /* Don't test has_arg with >, because some C compilers don't
+		 allow it to be used on enums.  */
+	      if (pfound->has_arg)
+		optarg = nameend + 1;
+	      else
+		{
+		  if (print_errors)
+		    {
+#if defined _LIBC && defined USE_IN_LIBIO
+		      char *buf;
+		      int n;
+#endif
+
+		      if (argv[optind - 1][1] == '-')
+			{
+			  /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+			  n = __asprintf (&buf, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+					  argv[0], pfound->name);
+#else
+			  fprintf (stderr, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+				   argv[0], pfound->name);
+#endif
+			}
+		      else
+			{
+			  /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+			  n = __asprintf (&buf, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+					  argv[0], argv[optind - 1][0],
+					  pfound->name);
+#else
+			  fprintf (stderr, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+				   argv[0], argv[optind - 1][0], pfound->name);
+#endif
+			}
+
+#if defined _LIBC && defined USE_IN_LIBIO
+		      if (n >= 0)
+			{
+			  if (_IO_fwide (stderr, 0) > 0)
+			    __fwprintf (stderr, L"%s", buf);
+			  else
+			    fputs (buf, stderr);
+
+			  free (buf);
+			}
+#endif
+		    }
+
+		  nextchar += strlen (nextchar);
+
+		  optopt = pfound->val;
+		  return '?';
+		}
+	    }
+	  else if (pfound->has_arg == 1)
+	    {
+	      if (optind < argc)
+		optarg = argv[optind++];
+	      else
+		{
+		  if (print_errors)
+		    {
+#if defined _LIBC && defined USE_IN_LIBIO
+		      char *buf;
+
+		      if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+				      argv[0], argv[optind - 1]) >= 0)
+			{
+			  if (_IO_fwide (stderr, 0) > 0)
+			    __fwprintf (stderr, L"%s", buf);
+			  else
+			    fputs (buf, stderr);
+
+			  free (buf);
+			}
+#else
+		      fprintf (stderr,
+			       _("%s: option `%s' requires an argument\n"),
+			       argv[0], argv[optind - 1]);
+#endif
+		    }
+		  nextchar += strlen (nextchar);
+		  optopt = pfound->val;
+		  return optstring[0] == ':' ? ':' : '?';
+		}
+	    }
+	  nextchar += strlen (nextchar);
+	  if (longind != NULL)
+	    *longind = option_index;
+	  if (pfound->flag)
+	    {
+	      *(pfound->flag) = pfound->val;
+	      return 0;
+	    }
+	  return pfound->val;
+	}
+
+      /* Can't find it as a long option.  If this is not getopt_long_only,
+	 or the option starts with '--' or is not a valid short
+	 option, then it's an error.
+	 Otherwise interpret it as a short option.  */
+      if (!long_only || argv[optind][1] == '-'
+	  || my_index (optstring, *nextchar) == NULL)
+	{
+	  if (print_errors)
+	    {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+	      int n;
+#endif
+
+	      if (argv[optind][1] == '-')
+		{
+		  /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+		  n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
+				  argv[0], nextchar);
+#else
+		  fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+			   argv[0], nextchar);
+#endif
+		}
+	      else
+		{
+		  /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+		  n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
+				  argv[0], argv[optind][0], nextchar);
+#else
+		  fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+			   argv[0], argv[optind][0], nextchar);
+#endif
+		}
+
+#if defined _LIBC && defined USE_IN_LIBIO
+	      if (n >= 0)
+		{
+		  if (_IO_fwide (stderr, 0) > 0)
+		    __fwprintf (stderr, L"%s", buf);
+		  else
+		    fputs (buf, stderr);
+
+		  free (buf);
+		}
+#endif
+	    }
+	  nextchar = (char *) "";
+	  optind++;
+	  optopt = 0;
+	  return '?';
+	}
+    }
+
+  /* Look at and handle the next short option-character.  */
+
+  {
+    char c = *nextchar++;
+    char *temp = my_index (optstring, c);
+
+    /* Increment `optind' when we start to process its last character.  */
+    if (*nextchar == '\0')
+      ++optind;
+
+    if (temp == NULL || c == ':')
+      {
+	if (print_errors)
+	  {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+	      int n;
+#endif
+
+	    if (posixly_correct)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
+				argv[0], c);
+#else
+		fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+#endif
+	      }
+	    else
+	      {
+#if defined _LIBC && defined USE_IN_LIBIO
+		n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
+				argv[0], c);
+#else
+		fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
+#endif
+	      }
+
+#if defined _LIBC && defined USE_IN_LIBIO
+	    if (n >= 0)
+	      {
+		if (_IO_fwide (stderr, 0) > 0)
+		  __fwprintf (stderr, L"%s", buf);
+		else
+		  fputs (buf, stderr);
+
+		free (buf);
+	      }
+#endif
+	  }
+	optopt = c;
+	return '?';
+      }
+    /* Convenience. Treat POSIX -W foo same as long option --foo */
+    if (temp[0] == 'W' && temp[1] == ';')
+      {
+	char *nameend;
+	const struct option *p;
+	const struct option *pfound = NULL;
+	int exact = 0;
+	int ambig = 0;
+	int indfound = 0;
+	int option_index;
+
+	/* This is an option that requires an argument.  */
+	if (*nextchar != '\0')
+	  {
+	    optarg = nextchar;
+	    /* If we end this ARGV-element by taking the rest as an arg,
+	       we must advance to the next element now.  */
+	    optind++;
+	  }
+	else if (optind == argc)
+	  {
+	    if (print_errors)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		char *buf;
+
+		if (__asprintf (&buf,
+				_("%s: option requires an argument -- %c\n"),
+				argv[0], c) >= 0)
+		  {
+		    if (_IO_fwide (stderr, 0) > 0)
+		      __fwprintf (stderr, L"%s", buf);
+		    else
+		      fputs (buf, stderr);
+
+		    free (buf);
+		  }
+#else
+		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+			 argv[0], c);
+#endif
+	      }
+	    optopt = c;
+	    if (optstring[0] == ':')
+	      c = ':';
+	    else
+	      c = '?';
+	    return c;
+	  }
+	else
+	  /* We already incremented `optind' once;
+	     increment it again when taking next ARGV-elt as argument.  */
+	  optarg = argv[optind++];
+
+	/* optarg is now the argument, see if it's in the
+	   table of longopts.  */
+
+	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
+	  /* Do nothing.  */ ;
+
+	/* Test all long options for either exact match
+	   or abbreviated matches.  */
+	for (p = longopts, option_index = 0; p->name; p++, option_index++)
+	  if (!strncmp (p->name, nextchar, nameend - nextchar))
+	    {
+	      if ((unsigned int) (nameend - nextchar) == strlen (p->name))
+		{
+		  /* Exact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		  exact = 1;
+		  break;
+		}
+	      else if (pfound == NULL)
+		{
+		  /* First nonexact match found.  */
+		  pfound = p;
+		  indfound = option_index;
+		}
+	      else
+		/* Second or later nonexact match found.  */
+		ambig = 1;
+	    }
+	if (ambig && !exact)
+	  {
+	    if (print_errors)
+	      {
+#if defined _LIBC && defined USE_IN_LIBIO
+		char *buf;
+
+		if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
+				argv[0], argv[optind]) >= 0)
+		  {
+		    if (_IO_fwide (stderr, 0) > 0)
+		      __fwprintf (stderr, L"%s", buf);
+		    else
+		      fputs (buf, stderr);
+
+		    free (buf);
+		  }
+#else
+		fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+			 argv[0], argv[optind]);
+#endif
+	      }
+	    nextchar += strlen (nextchar);
+	    optind++;
+	    return '?';
+	  }
+	if (pfound != NULL)
+	  {
+	    option_index = indfound;
+	    if (*nameend)
+	      {
+		/* Don't test has_arg with >, because some C compilers don't
+		   allow it to be used on enums.  */
+		if (pfound->has_arg)
+		  optarg = nameend + 1;
+		else
+		  {
+		    if (print_errors)
+		      {
+#if defined _LIBC && defined USE_IN_LIBIO
+			char *buf;
+
+			if (__asprintf (&buf, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+					argv[0], pfound->name) >= 0)
+			  {
+			    if (_IO_fwide (stderr, 0) > 0)
+			      __fwprintf (stderr, L"%s", buf);
+			    else
+			      fputs (buf, stderr);
+
+			    free (buf);
+			  }
+#else
+			fprintf (stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+				 argv[0], pfound->name);
+#endif
+		      }
+
+		    nextchar += strlen (nextchar);
+		    return '?';
+		  }
+	      }
+	    else if (pfound->has_arg == 1)
+	      {
+		if (optind < argc)
+		  optarg = argv[optind++];
+		else
+		  {
+		    if (print_errors)
+		      {
+#if defined _LIBC && defined USE_IN_LIBIO
+			char *buf;
+
+			if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+					argv[0], argv[optind - 1]) >= 0)
+			  {
+			    if (_IO_fwide (stderr, 0) > 0)
+			      __fwprintf (stderr, L"%s", buf);
+			    else
+			      fputs (buf, stderr);
+
+			    free (buf);
+			  }
+#else
+			fprintf (stderr,
+				 _("%s: option `%s' requires an argument\n"),
+				 argv[0], argv[optind - 1]);
+#endif
+		      }
+		    nextchar += strlen (nextchar);
+		    return optstring[0] == ':' ? ':' : '?';
+		  }
+	      }
+	    nextchar += strlen (nextchar);
+	    if (longind != NULL)
+	      *longind = option_index;
+	    if (pfound->flag)
+	      {
+		*(pfound->flag) = pfound->val;
+		return 0;
+	      }
+	    return pfound->val;
+	  }
+	  nextchar = NULL;
+	  return 'W';	/* Let the application handle it.   */
+      }
+    if (temp[1] == ':')
+      {
+	if (temp[2] == ':')
+	  {
+	    /* This is an option that accepts an argument optionally.  */
+	    if (*nextchar != '\0')
+	      {
+		optarg = nextchar;
+		optind++;
+	      }
+	    else
+	      optarg = NULL;
+	    nextchar = NULL;
+	  }
+	else
+	  {
+	    /* This is an option that requires an argument.  */
+	    if (*nextchar != '\0')
+	      {
+		optarg = nextchar;
+		/* If we end this ARGV-element by taking the rest as an arg,
+		   we must advance to the next element now.  */
+		optind++;
+	      }
+	    else if (optind == argc)
+	      {
+		if (print_errors)
+		  {
+		    /* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		    char *buf;
+
+		    if (__asprintf (&buf, _("\
+%s: option requires an argument -- %c\n"),
+				    argv[0], c) >= 0)
+		      {
+			if (_IO_fwide (stderr, 0) > 0)
+			  __fwprintf (stderr, L"%s", buf);
+			else
+			  fputs (buf, stderr);
+
+			free (buf);
+		      }
+...
 
[truncated message content]

[Ggnfs-commits] SF.net SVN: ggnfs:[434] trunk/build.vc10

From: <brg...@us...> - 2012-12-07 21:04:46

Revision: 434
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=434&view=rev
Author:   brgladman
Date:     2012-12-07 21:04:37 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
update Visual Studio experimental sieve build

Modified Paths:
--------------
    trunk/build.vc10/ggnfs.sln
    trunk/build.vc10/lasieve.exp/lasieve.exp.sln
    trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj

Modified: trunk/build.vc10/ggnfs.sln
===================================================================
--- trunk/build.vc10/ggnfs.sln	2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/ggnfs.sln	2012-12-07 21:04:37 UTC (rev 434)
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C5B2EA76-3258-4716-BA00-8F75BF8A7839}"
 	ProjectSection(SolutionItems) = preProject
 		file_copy.bat = file_copy.bat
@@ -56,169 +56,127 @@
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Debug|Win32.Build.0 = Debug|Win32
 		{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Debug|x64.ActiveCfg = Debug|x64
-		{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Debug|x64.Build.0 = Debug|x64
 		{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Release|Win32.ActiveCfg = Release|Win32
 		{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Release|Win32.Build.0 = Release|Win32
 		{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Release|x64.ActiveCfg = Release|x64
 		{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Release|x64.Build.0 = Release|x64
 		{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Debug|Win32.Build.0 = Debug|Win32
 		{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Debug|x64.ActiveCfg = Debug|x64
-		{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Debug|x64.Build.0 = Debug|x64
 		{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Release|Win32.ActiveCfg = Release|Win32
 		{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Release|Win32.Build.0 = Release|Win32
 		{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Release|x64.ActiveCfg = Release|x64
 		{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Release|x64.Build.0 = Release|x64
 		{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Debug|Win32.Build.0 = Debug|Win32
 		{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Debug|x64.ActiveCfg = Debug|x64
-		{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Debug|x64.Build.0 = Debug|x64
 		{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Release|Win32.ActiveCfg = Release|Win32
 		{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Release|Win32.Build.0 = Release|Win32
 		{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Release|x64.ActiveCfg = Release|x64
 		{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Release|x64.Build.0 = Release|x64
 		{97029F18-F90E-4FD4-96E4-22335BD04347}.Debug|Win32.ActiveCfg = Debug|Win32
-		{97029F18-F90E-4FD4-96E4-22335BD04347}.Debug|Win32.Build.0 = Debug|Win32
 		{97029F18-F90E-4FD4-96E4-22335BD04347}.Debug|x64.ActiveCfg = Debug|x64
-		{97029F18-F90E-4FD4-96E4-22335BD04347}.Debug|x64.Build.0 = Debug|x64
 		{97029F18-F90E-4FD4-96E4-22335BD04347}.Release|Win32.ActiveCfg = Release|Win32
 		{97029F18-F90E-4FD4-96E4-22335BD04347}.Release|Win32.Build.0 = Release|Win32
 		{97029F18-F90E-4FD4-96E4-22335BD04347}.Release|x64.ActiveCfg = Release|x64
 		{97029F18-F90E-4FD4-96E4-22335BD04347}.Release|x64.Build.0 = Release|x64
 		{A9BA6180-15F7-421C-8268-C0A1D3773551}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A9BA6180-15F7-421C-8268-C0A1D3773551}.Debug|Win32.Build.0 = Debug|Win32
 		{A9BA6180-15F7-421C-8268-C0A1D3773551}.Debug|x64.ActiveCfg = Debug|x64
-		{A9BA6180-15F7-421C-8268-C0A1D3773551}.Debug|x64.Build.0 = Debug|x64
 		{A9BA6180-15F7-421C-8268-C0A1D3773551}.Release|Win32.ActiveCfg = Release|Win32
 		{A9BA6180-15F7-421C-8268-C0A1D3773551}.Release|Win32.Build.0 = Release|Win32
 		{A9BA6180-15F7-421C-8268-C0A1D3773551}.Release|x64.ActiveCfg = Release|x64
 		{A9BA6180-15F7-421C-8268-C0A1D3773551}.Release|x64.Build.0 = Release|x64
 		{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Debug|Win32.Build.0 = Debug|Win32
 		{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Debug|x64.ActiveCfg = Debug|x64
-		{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Debug|x64.Build.0 = Debug|x64
 		{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Release|Win32.ActiveCfg = Release|Win32
 		{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Release|Win32.Build.0 = Release|Win32
 		{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Release|x64.ActiveCfg = Release|x64
 		{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Release|x64.Build.0 = Release|x64
 		{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Debug|Win32.Build.0 = Debug|Win32
 		{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Debug|x64.ActiveCfg = Debug|x64
-		{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Debug|x64.Build.0 = Debug|x64
 		{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Release|Win32.ActiveCfg = Release|Win32
 		{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Release|Win32.Build.0 = Release|Win32
 		{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Release|x64.ActiveCfg = Release|x64
 		{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Release|x64.Build.0 = Release|x64
 		{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Debug|Win32.Build.0 = Debug|Win32
 		{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Debug|x64.ActiveCfg = Debug|x64
-		{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Debug|x64.Build.0 = Debug|x64
 		{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Release|Win32.ActiveCfg = Release|Win32
 		{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Release|Win32.Build.0 = Release|Win32
 		{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Release|x64.ActiveCfg = Release|x64
 		{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Release|x64.Build.0 = Release|x64
 		{7E52286B-67E8-4C69-8015-EEF595657674}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7E52286B-67E8-4C69-8015-EEF595657674}.Debug|Win32.Build.0 = Debug|Win32
 		{7E52286B-67E8-4C69-8015-EEF595657674}.Debug|x64.ActiveCfg = Debug|x64
-		{7E52286B-67E8-4C69-8015-EEF595657674}.Debug|x64.Build.0 = Debug|x64
 		{7E52286B-67E8-4C69-8015-EEF595657674}.Release|Win32.ActiveCfg = Release|Win32
 		{7E52286B-67E8-4C69-8015-EEF595657674}.Release|Win32.Build.0 = Release|Win32
 		{7E52286B-67E8-4C69-8015-EEF595657674}.Release|x64.ActiveCfg = Release|x64
 		{7E52286B-67E8-4C69-8015-EEF595657674}.Release|x64.Build.0 = Release|x64
 		{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Debug|Win32.Build.0 = Debug|Win32
 		{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Debug|x64.ActiveCfg = Debug|x64
-		{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Debug|x64.Build.0 = Debug|x64
 		{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Release|Win32.ActiveCfg = Release|Win32
 		{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Release|Win32.Build.0 = Release|Win32
 		{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Release|x64.ActiveCfg = Release|x64
 		{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Release|x64.Build.0 = Release|x64
 		{5312A2AE-53B6-43FE-BF45-0F4102944537}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5312A2AE-53B6-43FE-BF45-0F4102944537}.Debug|Win32.Build.0 = Debug|Win32
 		{5312A2AE-53B6-43FE-BF45-0F4102944537}.Debug|x64.ActiveCfg = Debug|x64
-		{5312A2AE-53B6-43FE-BF45-0F4102944537}.Debug|x64.Build.0 = Debug|x64
 		{5312A2AE-53B6-43FE-BF45-0F4102944537}.Release|Win32.ActiveCfg = Release|Win32
 		{5312A2AE-53B6-43FE-BF45-0F4102944537}.Release|Win32.Build.0 = Release|Win32
 		{5312A2AE-53B6-43FE-BF45-0F4102944537}.Release|x64.ActiveCfg = Release|x64
 		{5312A2AE-53B6-43FE-BF45-0F4102944537}.Release|x64.Build.0 = Release|x64
 		{035DE163-0989-47C0-A63B-B327C5D4ED00}.Debug|Win32.ActiveCfg = Debug|Win32
-		{035DE163-0989-47C0-A63B-B327C5D4ED00}.Debug|Win32.Build.0 = Debug|Win32
 		{035DE163-0989-47C0-A63B-B327C5D4ED00}.Debug|x64.ActiveCfg = Debug|x64
-		{035DE163-0989-47C0-A63B-B327C5D4ED00}.Debug|x64.Build.0 = Debug|x64
 		{035DE163-0989-47C0-A63B-B327C5D4ED00}.Release|Win32.ActiveCfg = Release|Win32
 		{035DE163-0989-47C0-A63B-B327C5D4ED00}.Release|Win32.Build.0 = Release|Win32
 		{035DE163-0989-47C0-A63B-B327C5D4ED00}.Release|x64.ActiveCfg = Release|x64
 		{035DE163-0989-47C0-A63B-B327C5D4ED00}.Release|x64.Build.0 = Release|x64
 		{0B29F448-FD43-4C93-A7D4-7B305150F444}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0B29F448-FD43-4C93-A7D4-7B305150F444}.Debug|Win32.Build.0 = Debug|Win32
 		{0B29F448-FD43-4C93-A7D4-7B305150F444}.Debug|x64.ActiveCfg = Debug|x64
-		{0B29F448-FD43-4C93-A7D4-7B305150F444}.Debug|x64.Build.0 = Debug|x64
 		{0B29F448-FD43-4C93-A7D4-7B305150F444}.Release|Win32.ActiveCfg = Release|Win32
 		{0B29F448-FD43-4C93-A7D4-7B305150F444}.Release|Win32.Build.0 = Release|Win32
 		{0B29F448-FD43-4C93-A7D4-7B305150F444}.Release|x64.ActiveCfg = Release|x64
 		{0B29F448-FD43-4C93-A7D4-7B305150F444}.Release|x64.Build.0 = Release|x64
 		{985482DC-7D29-4658-B4F4-2978C314C48D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{985482DC-7D29-4658-B4F4-2978C314C48D}.Debug|Win32.Build.0 = Debug|Win32
 		{985482DC-7D29-4658-B4F4-2978C314C48D}.Debug|x64.ActiveCfg = Debug|x64
-		{985482DC-7D29-4658-B4F4-2978C314C48D}.Debug|x64.Build.0 = Debug|x64
 		{985482DC-7D29-4658-B4F4-2978C314C48D}.Release|Win32.ActiveCfg = Release|Win32
 		{985482DC-7D29-4658-B4F4-2978C314C48D}.Release|Win32.Build.0 = Release|Win32
 		{985482DC-7D29-4658-B4F4-2978C314C48D}.Release|x64.ActiveCfg = Release|x64
 		{985482DC-7D29-4658-B4F4-2978C314C48D}.Release|x64.Build.0 = Release|x64
 		{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Debug|Win32.Build.0 = Debug|Win32
 		{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Debug|x64.ActiveCfg = Debug|x64
-		{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Debug|x64.Build.0 = Debug|x64
 		{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Release|Win32.ActiveCfg = Release|Win32
 		{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Release|Win32.Build.0 = Release|Win32
 		{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Release|x64.ActiveCfg = Release|x64
 		{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Release|x64.Build.0 = Release|x64
 		{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Debug|Win32.ActiveCfg = Debug|Win32
-		{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Debug|Win32.Build.0 = Debug|Win32
 		{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Debug|x64.ActiveCfg = Debug|x64
-		{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Debug|x64.Build.0 = Debug|x64
 		{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Release|Win32.ActiveCfg = Release|Win32
 		{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Release|Win32.Build.0 = Release|Win32
 		{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Release|x64.ActiveCfg = Release|x64
 		{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Release|x64.Build.0 = Release|x64
 		{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Debug|Win32.Build.0 = Debug|Win32
 		{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Debug|x64.ActiveCfg = Debug|x64
-		{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Debug|x64.Build.0 = Debug|x64
 		{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Release|Win32.ActiveCfg = Release|Win32
 		{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Release|Win32.Build.0 = Release|Win32
 		{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Release|x64.ActiveCfg = Release|x64
 		{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Release|x64.Build.0 = Release|x64
 		{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Debug|Win32.Build.0 = Debug|Win32
 		{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Debug|x64.ActiveCfg = Debug|x64
-		{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Debug|x64.Build.0 = Debug|x64
 		{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Release|Win32.ActiveCfg = Release|Win32
 		{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Release|Win32.Build.0 = Release|Win32
 		{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Release|x64.ActiveCfg = Release|x64
 		{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Release|x64.Build.0 = Release|x64
 		{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Debug|Win32.Build.0 = Debug|Win32
 		{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Debug|x64.ActiveCfg = Debug|x64
-		{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Debug|x64.Build.0 = Debug|x64
 		{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Release|Win32.ActiveCfg = Release|Win32
 		{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Release|Win32.Build.0 = Release|Win32
 		{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Release|x64.ActiveCfg = Release|x64
 		{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Release|x64.Build.0 = Release|x64
 		{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Debug|Win32.ActiveCfg = Debug|Win32
-		{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Debug|Win32.Build.0 = Debug|Win32
 		{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Debug|x64.ActiveCfg = Debug|x64
-		{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Debug|x64.Build.0 = Debug|x64
 		{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Release|Win32.ActiveCfg = Release|Win32
 		{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Release|Win32.Build.0 = Release|Win32
 		{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Release|x64.ActiveCfg = Release|x64
 		{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Release|x64.Build.0 = Release|x64
 		{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Debug|Win32.Build.0 = Debug|Win32
 		{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Debug|x64.ActiveCfg = Debug|x64
-		{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Debug|x64.Build.0 = Debug|x64
 		{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Release|Win32.ActiveCfg = Release|Win32
 		{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Release|Win32.Build.0 = Release|Win32
 		{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Release|x64.ActiveCfg = Release|x64

Modified: trunk/build.vc10/lasieve.exp/lasieve.exp.sln
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve.exp.sln	2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve.exp.sln	2012-12-07 21:04:37 UTC (rev 434)
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieve", "liblasieve\liblasieve.vcxproj", "{6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI11", "liblasieveI11\liblasieveI11.vcxproj", "{BAF749BD-63E0-437A-B229-6B5A3F570E6A}"
@@ -59,30 +59,43 @@
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Debug|x64.ActiveCfg = Debug|x64
 		{6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Release|x64.ActiveCfg = Release|x64
+		{6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Release|x64.Build.0 = Release|x64
 		{BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Debug|x64.ActiveCfg = Debug|x64
 		{BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Release|x64.ActiveCfg = Release|x64
+		{BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Release|x64.Build.0 = Release|x64
 		{451C3388-7276-48A1-A336-B2C4DE3C588A}.Debug|x64.ActiveCfg = Debug|x64
 		{451C3388-7276-48A1-A336-B2C4DE3C588A}.Release|x64.ActiveCfg = Release|x64
+		{451C3388-7276-48A1-A336-B2C4DE3C588A}.Release|x64.Build.0 = Release|x64
 		{ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Debug|x64.ActiveCfg = Debug|x64
 		{ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Release|x64.ActiveCfg = Release|x64
+		{ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Release|x64.Build.0 = Release|x64
 		{9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Debug|x64.ActiveCfg = Debug|x64
 		{9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Release|x64.ActiveCfg = Release|x64
+		{9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Release|x64.Build.0 = Release|x64
 		{36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Debug|x64.ActiveCfg = Debug|x64
 		{36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Release|x64.ActiveCfg = Release|x64
+		{36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Release|x64.Build.0 = Release|x64
 		{0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Debug|x64.ActiveCfg = Debug|x64
 		{0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Release|x64.ActiveCfg = Release|x64
+		{0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Release|x64.Build.0 = Release|x64
 		{C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Debug|x64.ActiveCfg = Debug|x64
 		{C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Release|x64.ActiveCfg = Release|x64
+		{C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Release|x64.Build.0 = Release|x64
 		{BBCFB293-3606-4549-9176-0AF516F84BAC}.Debug|x64.ActiveCfg = Debug|x64
 		{BBCFB293-3606-4549-9176-0AF516F84BAC}.Release|x64.ActiveCfg = Release|x64
+		{BBCFB293-3606-4549-9176-0AF516F84BAC}.Release|x64.Build.0 = Release|x64
 		{DD4C5F19-1F05-494B-8F12-C4A70444293C}.Debug|x64.ActiveCfg = Debug|x64
 		{DD4C5F19-1F05-494B-8F12-C4A70444293C}.Release|x64.ActiveCfg = Release|x64
+		{DD4C5F19-1F05-494B-8F12-C4A70444293C}.Release|x64.Build.0 = Release|x64
 		{BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Debug|x64.ActiveCfg = Debug|x64
 		{BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Release|x64.ActiveCfg = Release|x64
+		{BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Release|x64.Build.0 = Release|x64
 		{379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Debug|x64.ActiveCfg = Debug|x64
 		{379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Release|x64.ActiveCfg = Release|x64
+		{379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Release|x64.Build.0 = Release|x64
 		{3E382630-1512-4975-B165-1CC2F6E0F407}.Debug|x64.ActiveCfg = Debug|x64
 		{3E382630-1512-4975-B165-1CC2F6E0F407}.Release|x64.ActiveCfg = Release|x64
+		{3E382630-1512-4975-B165-1CC2F6E0F407}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -24,22 +16,11 @@
     <RootNamespace>lasieve4I11e</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -107,26 +61,6 @@
       <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -24,22 +16,11 @@
     <RootNamespace>lasieve4I11e</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -107,26 +61,6 @@
       <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -24,22 +16,11 @@
     <RootNamespace>lasieve4I11e</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;I_bits=14;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -107,26 +61,6 @@
       <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;I_bits=14;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -24,22 +16,11 @@
     <RootNamespace>lasieve4I11e</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;I_bits=15;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -107,26 +61,6 @@
       <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;I_bits=15;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -24,22 +16,11 @@
     <RootNamespace>lasieve4I11e</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;I_bits=16;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -107,26 +61,6 @@
       <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;I_bits=16;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

Modified: trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj	2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -24,22 +16,11 @@
     <RootNamespace>liblasieveI11</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -50,48 +31,19 @@
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\vsyasm.props" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <YASM>
-      <Defines>I_bits=13</Defines>
-    </YASM>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -110,27 +62,6 @@
       <Defines>I_bits=13</Defines>
     </YASM>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <YASM>
-      <Defines>I_bits=13</Defines>
-    </YASM>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>

Modified: trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj	2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
@@ -24,22 +16,11 @@
     <RootNamespace>liblasieveI11</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  ...
 
[truncated message content]

[Ggnfs-commits] SF.net SVN: ggnfs:[433] trunk/build.vc10/lasieve.exp

From: <brg...@us...> - 2012-12-07 20:56:23

Revision: 433
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=433&view=rev
Author:   brgladman
Date:     2012-12-07 20:56:16 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
change binary directory for Visual Studio build of experimental sieve 

Modified Paths:
--------------
    trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj

Modified: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
@@ -39,9 +39,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
@@ -67,12 +67,14 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
@@ -67,12 +67,14 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
@@ -67,12 +67,14 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
@@ -67,12 +67,14 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2012-12-07 20:56:16 UTC (rev 433)
@@ -67,12 +67,14 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[432] trunk/build.vc10/lasieve.exp

From: <brg...@us...> - 2012-12-07 17:11:44

Revision: 432
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=432&view=rev
Author:   brgladman
Date:     2012-12-07 17:11:37 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
revert build to Visual Studio 2010

Modified Paths:
--------------
    trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj

Modified: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -20,14 +20,12 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -20,14 +20,12 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -20,14 +20,12 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

Modified: trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
+++ trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj	2012-12-07 17:11:37 UTC (rev 432)
@@ -28,27 +28,23 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[431] trunk/build.vc10

From: <brg...@us...> - 2012-12-07 10:53:54

Revision: 431
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=431&view=rev
Author:   brgladman
Date:     2012-12-07 10:53:42 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
update Visual Studio experimental sieve build

Modified Paths:
--------------
    trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
    trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters
    trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters
    trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters
    trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters
    trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters
    trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters
    trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters
    trunk/build.vc10/makefb/makefb.vcxproj
    trunk/build.vc10/matbuild/matbuild.vcxproj
    trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
    trunk/build.vc10/matprune/matprune.vcxproj
    trunk/build.vc10/matsolve/matsolve.vcxproj
    trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
    trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
    trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
    trunk/build.vc10/pol51opt/pol51opt.vcxproj
    trunk/build.vc10/pol51optx/pol51optx.vcxproj
    trunk/build.vc10/polyselect/polyselect.vcxproj
    trunk/build.vc10/procrels/procrels.vcxproj
    trunk/build.vc10/sieve/sieve.vcxproj
    trunk/build.vc10/sqrt/sqrt.vcxproj

Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -261,8 +261,8 @@
     </YASM>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\config.h" />
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\config.h" />
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\include\ggnfs.h" />
     <ClInclude Include="..\..\include\prand.h" />
     <ClInclude Include="..\..\include\version.h" />

Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -338,7 +338,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\include\ggnfs.h" />
     <ClInclude Include="..\..\include\version.h" />
     <ClInclude Include="..\..\src\if.h" />

Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -338,7 +338,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\include\ggnfs.h" />
     <ClInclude Include="..\..\include\version.h" />
     <ClInclude Include="..\..\src\if.h" />

Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -302,7 +302,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\include\ggnfs.h" />
     <ClInclude Include="..\..\include\version.h" />
     <ClInclude Include="..\..\src\if.h" />

Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -302,7 +302,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\include\ggnfs.h" />
     <ClInclude Include="..\..\include\version.h" />
     <ClInclude Include="..\..\src\if.h" />

Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -302,7 +302,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\include\ggnfs.h" />
     <ClInclude Include="..\..\include\version.h" />
     <ClInclude Include="..\..\src\if.h" />

Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -307,7 +307,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\include\ggnfs.h" />
     <ClInclude Include="..\..\include\version.h" />
     <ClInclude Include="..\..\src\if.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -20,12 +20,14 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -50,13 +52,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=11;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -68,7 +70,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=11;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -76,7 +78,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -98,8 +100,8 @@
     <ClCompile Include="..\..\getopt.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters	2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
     <ClInclude Include="..\..\unistd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -122,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -142,7 +146,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -164,8 +168,8 @@
     <ClCompile Include="..\..\getopt.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -122,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -142,7 +146,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -164,8 +168,8 @@
     <ClCompile Include="..\..\getopt.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters	2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
     <ClInclude Include="..\..\unistd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=14;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=14;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=14;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -122,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=14;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -142,7 +146,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -164,8 +168,8 @@
     <ClCompile Include="..\..\getopt.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters	2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
     <ClInclude Include="..\..\unistd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=15;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=15;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=15;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -122,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=15;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -142,7 +146,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -164,8 +168,8 @@
     <ClCompile Include="..\..\getopt.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters	2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
     <ClInclude Include="..\..\unistd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=16;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=16;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=16;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -122,7 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=16;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -142,7 +146,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -164,8 +168,8 @@
     <ClCompile Include="..\..\getopt.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters	2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
     <ClInclude Include="..\..\unistd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -20,12 +20,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -55,7 +57,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;n_i_bits=11;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\;..\..\..\src\experimental\lasieve4_64\x64</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\..\mpir\lib\$(IntDir);..\..\;..\..\..\src\experimental\lasieve4_64\x64</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -72,7 +74,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;n_i_bits=11;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -80,7 +82,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -149,7 +151,7 @@
     <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\zeit.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h" />

Modified: trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters	2012-12-07 10:53:42 UTC (rev 431)
@@ -55,7 +55,7 @@
     <ClInclude Include="..\..\unistd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -20,12 +20,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -51,7 +53,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;I_bits=11;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -72,7 +74,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;I_bits=11;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -127,7 +129,7 @@
     </YASM>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\mpir.h" />
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters	2012-12-07 10:53:42 UTC (rev 431)
@@ -69,7 +69,7 @@
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\mpir.h">
+    <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj	2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj	2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
  ...
 
[truncated message content]

[Ggnfs-commits] SF.net SVN: ggnfs:[430] trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c

From: <Ba...@us...> - 2012-08-26 20:19:51

Revision: 430
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=430&view=rev
Author:   Batalov
Date:     2012-08-26 20:19:45 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Added ETA to verbose output

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c

Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2012-08-18 23:02:26 UTC (rev 429)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2012-08-26 20:19:45 UTC (rev 430)
@@ -2730,8 +2730,10 @@
       if (tNow > lastReport + 5.0) {
 	lastReport = tNow;
         if(verbose) {
-	  fprintf(stderr, "\rtotal yield: %u, q=%u (%1.5lf sec/rel) ", 
-		(unsigned int)yield, (unsigned int)special_q, (tNow - tStart)/yield);
+          int eta = (int)(((double)last_spq - special_q)*(tNow - tStart)/((double)special_q - first_spq+1)/60);
+	  fprintf(stderr, "\rtotal yield: %u, q=%u (%1.5lf sec/rel; ETA %dh%02dm)  ", 
+		(unsigned int)yield, (unsigned int)special_q, (tNow - tStart)/yield,
+                eta/60, eta%60);
 	  fflush(stderr);
         }
       }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[429] trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c

From: <Ba...@us...> - 2012-08-18 23:02:32

Revision: 429
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=429&view=rev
Author:   Batalov
Date:     2012-08-18 23:02:26 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
Change hex relation strings to uppercase (no effect other than cosmetical)

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c

Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2012-06-04 20:48:08 UTC (rev 428)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2012-08-18 23:02:26 UTC (rev 429)
@@ -4032,7 +4032,8 @@
   fprintf(g_ofile, ",");
   mpz_out_str(g_ofile, 10, sr_b);
   
-#define OBASE 16
+#define OBASE -16
+  /* -16 means "use upper-case" hex in gmplib >= 4.0 */
   for(s= 0;s<2;s++) {
     int num = 0;
     u32_t *x = fbp_buffers_ub[1-s];
@@ -4046,7 +4047,7 @@
     while (x-- != fbp_buffers[1-s]) {
       if ((unsigned int)*x <1000) continue;
       if (num>0) fprintf(g_ofile, ",");
-      fprintf(g_ofile, "%x", (unsigned int)*x);
+      fprintf(g_ofile, "%X", (unsigned int)*x);
       num++;
     }
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[428] trunk/contrib/remdups/remdups4.c

From: <Ba...@us...> - 2012-06-04 20:48:15

Revision: 428
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=428&view=rev
Author:   Batalov
Date:     2012-06-04 20:48:08 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
Verbose mode was added (Lionel Debroux)

Modified Paths:
--------------
    trunk/contrib/remdups/remdups4.c

Modified: trunk/contrib/remdups/remdups4.c
===================================================================
--- trunk/contrib/remdups/remdups4.c	2012-02-25 00:21:07 UTC (rev 427)
+++ trunk/contrib/remdups/remdups4.c	2012-06-04 20:48:08 UTC (rev 428)
@@ -4,6 +4,7 @@
       only syntax (a,b:<csv-of-factors>:<csv-of-factors>) is checked and incomplete lines are discarded;
       validity of relations is not tested (nor is polynomial needed).
   Hashing of (a,b) values was changed to accomodate for gnfs projects with huge skews (S.Batalov).
+  Verbose mode was added (Lionel Debroux)
 
   This version is a filter (stdin, stdout):
     you may redirect stdout to /dev/null and/or
@@ -24,17 +25,20 @@
   02111-1307, USA.
 */
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 typedef unsigned long uint32;
 typedef long int32;
 typedef unsigned long long uint64;
 
-#define MDVAL 327673
+#define MDVAL (327673)
+#define REPORT_EVERY_N_UNIQUE_RELS (500000)
 
-int strccnt(const char *s, int c)
+static int strccnt(const char *s, int c)
 {
 	const unsigned char *us = (const unsigned char *) s;
 	const unsigned char uc = c;
@@ -48,16 +52,27 @@
         int mm,nn,av;
 	FILE *badfile;
 	uint64 ** arra;
-        int n[MDVAL]={0};
-	int numbad=0, numdups=0, numuniq=0,numskip=0;
+	int n[MDVAL]={0};
+	unsigned int numbad=0, numdups=0, numuniq=0, numskip=0, prevnumdups=0;
 	int DIM=1000;
+	time_t curtime;
+	long allocated=0;
+	int verbose = 0;
 
-        if (argc == 2) {
-	  DIM=atoi(argv[1]); 
-        } else {
-	  fprintf(stderr,"\nusage: cat relations.file(s) | %s DIM > out_file \n"
-		  "\t DIM is a number (5 per million relations recommended)\n\n", argv[0]);
-	  exit(-1);
+	if (argc >= 2) {
+		if (!strcmp("-h", argv[1]) || !strcmp("--help", argv[1]))
+			goto usage;
+
+		DIM=atoi(argv[1]);
+		if (argc >= 3) {
+			if (!strcmp("-v", argv[2]) || !strcmp("--verbose", argv[2]))
+				verbose = 1;
+		}
+	} else {
+usage:
+		fprintf(stderr,"\nusage: cat relations.file(s) | %s DIM [-v/--verbose] > out_file \n"
+		               "\t DIM is a number (5 per million relations recommended)\n\n", argv[0]);
+		exit(-1);
 	}
 
 	badfile = fopen("badrels.txt", "a");
@@ -72,27 +87,42 @@
 		exit(1);
 	}
 #endif
+	if (verbose) {
+		curtime = time(NULL);
+		fprintf(stderr, "Starting program at %s", ctime(&curtime));
+	}
 
 	/* initialize arrays */
 	arra = (uint64**)malloc(MDVAL * sizeof(uint64 *));
-	for(mm = 0; mm < MDVAL; mm++){
+	if(!arra) {
+		fprintf(stderr, "out of memory\n");
+		exit(1);
+	}
+	if (verbose) {
+		fprintf(stderr, "allocated %ld bytes for pointers\n", MDVAL * sizeof(uint64 *));
+	}
+	for(mm = 0; mm < MDVAL; mm++) {
 #define CHUNK 2048
-	  if((mm % CHUNK) == 0) {
-	    arra[mm] = (uint64*)malloc(CHUNK * DIM * sizeof(uint64));
-	    if(!arra[mm]) {
-	      fprintf(stderr, "out of memory\n");
-	      exit(1);
-	    }
-	    /* memset(arra[mm],0,CHUNK * DIM * sizeof(uint64)); */  /* unnecessary */
-	  } else {
-	    arra[mm] = arra[mm-1] + DIM;
-	  }
+		if((mm % CHUNK) == 0) {
+			arra[mm] = (uint64*)malloc(CHUNK * DIM * sizeof(uint64));
+			if(!arra[mm]) {
+				fprintf(stderr, "out of memory\n");
+				exit(1);
+			}
+			allocated += CHUNK * DIM * sizeof(uint64);
+			/* memset(arra[mm],0,CHUNK * DIM * sizeof(uint64)); */  /* unnecessary */
+		} else {
+			arra[mm] = arra[mm-1] + DIM;
+		}
 	}
+	if (verbose) {
+		fprintf(stderr, "allocated %ld bytes for arrays\n", allocated);
+	}
 
 	while (fgets(buf, sizeof(buf), stdin)) {
-		char *tmp, *field_end;
+		char *tmp;
 		uint64 a;
-		int32 i, j, p, cpos;
+		int32 i, p, cpos;
 
 		if (buf[0] == '#') {
 			printf("%s", buf);
@@ -131,20 +161,44 @@
 		if (n[p]<DIM) arra[p][n[p]++]=a; /* Not quitting after a whole lot of work! Just stop extending the bin --SB. */
 		else numskip++;
 		numuniq++;
-		if(numuniq % 500000 == 0)
-			fprintf(stderr,"\r %.1fM relns \r", numuniq/1000000.0);
+		if(numuniq % REPORT_EVERY_N_UNIQUE_RELS == 0) {
+			if (!verbose) {
+				fprintf(stderr,"\r %.1fM relns \r", numuniq/1000000.0);
+			} else {
+				char buf2[32];
+				curtime = time(NULL);
+
+				strcpy(buf2, ctime(&curtime));
+				*(strchr(buf2, '\n')) = 0;
+				fprintf(stderr, "%s  %.1fM unique relns  %.2fM duplicate relns (+%.2fM, avg D/U ratio in block was %.1f%%)\n",
+					buf2,
+					numuniq/1000000.0,
+					numdups/1000000.0,
+					(numdups - prevnumdups)/1000000.0,
+					100.0*(numdups - prevnumdups)/(REPORT_EVERY_N_UNIQUE_RELS + numdups - prevnumdups));
+				prevnumdups = numdups;
+			}
+		}
 		for(tmp=buf;*tmp;tmp++) *tmp=tolower(*tmp); /* will compress better */
 		printf("%s", buf);
 	skip_:  ;
 	}
-		
-        fprintf(stderr,"Found %d unique, %d duplicate, and %d bad relations.\n",numuniq, numdups, numbad);
+
+	if (!verbose) {
+		fprintf(stderr,"Found %d unique, %d duplicate, and %d bad relations.\n",numuniq, numdups, numbad);
+	} else {
+		fprintf(stderr,"Found %u unique, %u duplicate (%.1f%% of total), and %u bad relations.\n", numuniq, numdups, 100.0*numdups/(numuniq+numdups), numbad);
+	}
 	for (av=0,mm=1,nn=n[0];mm<MDVAL;mm++) {if (n[mm]>nn) nn=n[mm]; av+=n[mm];}
 	fprintf(stderr,"Largest dimension used: %d of %d\n",nn,DIM);
 	fprintf(stderr,"Average dimension used: %.1f of %d\n",((double)av)/MDVAL,DIM);
 	if(nn>=DIM) fprintf(stderr,"*** Some redundant relations may have been retained (increase DIM)\n");
-	if(numskip) fprintf(stderr,"*** %d (quasi-unique) relations were not hashed\n",numskip);
+	if(numskip) fprintf(stderr,"*** %u (quasi-unique) relations were not hashed\n",numskip);
 	if(numbad) fprintf(badfile, "\n");	/* usually last reln line is truncated and ends up in the bad bin. We don't want them to stick together */
 	fclose(badfile);
+	if (verbose) {
+		curtime = time(NULL);
+		fprintf(stderr, "Terminating program at %s", ctime(&curtime));
+	}
 	return 0;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[427] trunk/tests/factMsieve.pl

From: <Ba...@us...> - 2012-02-25 00:21:14

Revision: 427
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=427&view=rev
Author:   Batalov
Date:     2012-02-25 00:21:07 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
set GZIPDAT=1 if you want to use gzipped dat; DO NOT mix and match with runs in progress!

Modified Paths:
--------------
    trunk/tests/factMsieve.pl

Modified: trunk/tests/factMsieve.pl
===================================================================
--- trunk/tests/factMsieve.pl	2012-02-19 21:12:28 UTC (rev 426)
+++ trunk/tests/factMsieve.pl	2012-02-25 00:21:07 UTC (rev 427)
@@ -51,6 +51,8 @@
 # Bah, this causes a fatal error if GMP BigInt is not available.
 # use Math::BigInt lib => 'GMP';
 
+$GZIPDAT = 0;                 # keep the .dat file plain   --OR--
+# $GZIPDAT = 1;			# keep the .dat file gzipped
 $NUM_CPUS=1;
 $NUM_THREADS=$NUM_CPUS;
 
@@ -322,9 +324,11 @@
 ###########################################################
 # Count the number of lines in the DATFILE
 ###########################################################
-  my $count = 0;
-  open(FILE, "< $DATNAME") or die "can't open $DATNAME: $!";
+  my $count = -1;
+  # open(FILE, "< $DATNAME") or die "can't open $DATNAME: $!";
+  open(FILE, "\"$GZIP\" -dfcq $DATNAME |") or die "can't open $DATNAME: $!";
   $count++ while <FILE>;
+  close FILE;
   return $count;
 }
 
@@ -1379,7 +1383,9 @@
       print OF "$N\n";
       close(OF);
 
-      open(OF, ">$DATNAME");
+      # die if -e $DATNAME;  # if you don't want to overwrite!
+
+      open(OF, $GZIPDAT?"|\"$GZIP\">$DATNAME":">$DATNAME");
       print OF "N $N\n";
       close(OF);
 
@@ -1705,9 +1711,15 @@
       $MINRELS=$1 if($1);
       close IN;
     }
-    $cmd="\"$CAT\" spairs.out >> $DATNAME";
-    print "=>$cmd\n" if($ECHO_CMDLINE);
-    concat("spairs.out", ">>", "$DATNAME");
+    if($GZIPDAT) {
+	$cmd="\"$GZIP\" -5 -c spairs.out >> $DATNAME";
+	print "=>$cmd\n" if($ECHO_CMDLINE);
+	system($cmd);
+    } else {
+	$cmd="\"$CAT\" spairs.out >> $DATNAME";
+	print "=>$cmd\n" if($ECHO_CMDLINE);
+	concat("spairs.out", ">>", "$DATNAME");
+    }
     $CURR_RELS = linecount;
     print "Found $CURR_RELS relations, need at least $MINRELS to proceed.\n";
     if ($CURR_RELS > $MINRELS) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[426] trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c

From: <Ba...@us...> - 2012-02-19 21:12:34

Revision: 426
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=426&view=rev
Author:   Batalov
Date:     2012-02-19 21:12:28 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
minor

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c

Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2012-02-12 22:23:43 UTC (rev 425)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2012-02-19 21:12:28 UTC (rev 426)
@@ -1425,12 +1425,14 @@
 	    }
 	  
 	  else{
+#if 0
 	    char *cmd;
 
 	    asprintf(&cmd,"touch badsched.%s.%u.%u.%u",base_name,
 	             special_q_side,special_q,r[root_no]);
 	    system(cmd);
 	    free(cmd);
+#endif
 	    continue;
 	  }
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[425] trunk/src/experimental/lasieve4_64

From: <Ba...@us...> - 2012-02-12 22:23:50

Revision: 425
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=425&view=rev
Author:   Batalov
Date:     2012-02-12 22:23:43 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
minor

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/gmp-aux.h
    trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c

Modified: trunk/src/experimental/lasieve4_64/gmp-aux.h
===================================================================
--- trunk/src/experimental/lasieve4_64/gmp-aux.h	2011-12-20 09:14:29 UTC (rev 424)
+++ trunk/src/experimental/lasieve4_64/gmp-aux.h	2012-02-12 22:23:43 UTC (rev 425)
@@ -3,7 +3,7 @@
 
 void adjust_mpz_bufsize(mpz_t**x,size_t*alloc_ptr,size_t size,size_t increment);
 int string2mpz(mpz_t rop,char*x,int base);
-#if __GNU_MP_VERSION < 3 || __GNU_MP_VERSION_MINOR == 0
+#if __GNU_MP_VERSION < 3 || GNU_MP_VERSION == 3 && GNU_MP_VERSION_MINOR == 0
 #define NEED_MPZ_MUL_SI
 void mpz_mul_si(mpz_t x,mpz_t y,long int z);
 #endif

Modified: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c
===================================================================
--- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2011-12-20 09:14:29 UTC (rev 424)
+++ trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c	2012-02-12 22:23:43 UTC (rev 425)
@@ -3992,11 +3992,13 @@
       if(mpz_sgn(large_primes[s1][1]) == 0) { /* remainder == 0? */
 	mpz_set(large_primes[s1][1],large_primes[s1][0]);
 	nlp[s1]= 2;
+#if 0 /* this is now tested well enough, no need for a message */
 	if(verbose > 1) {
 	  fprintf(stderr," mpqs on a prime square ");
 	  mpz_out_str(stderr,10,large_primes[s1][0]);
 	  fprintf(stderr,"^2  ");
 	}
+#endif
 	continue;
       }
       if(verbose > 1) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[424] trunk/build.vc10

From: <brg...@us...> - 2011-12-20 09:14:42

Revision: 424
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=424&view=rev
Author:   brgladman
Date:     2011-12-20 09:14:29 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
set Visual Studio output directories to ggnfs\lib and ggnfs\bin

Modified Paths:
--------------
    trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
    trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
    trunk/build.vc10/makefb/makefb.vcxproj
    trunk/build.vc10/matbuild/matbuild.vcxproj
    trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
    trunk/build.vc10/matprune/matprune.vcxproj
    trunk/build.vc10/matsolve/matsolve.vcxproj
    trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
    trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
    trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
    trunk/build.vc10/pol51opt/pol51opt.vcxproj
    trunk/build.vc10/pol51optx/pol51optx.vcxproj
    trunk/build.vc10/polyselect/polyselect.vcxproj
    trunk/build.vc10/procrels/procrels.vcxproj
    trunk/build.vc10/sieve/sieve.vcxproj
    trunk/build.vc10/sqrt/sqrt.vcxproj

Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj	2011-12-20 09:14:29 UTC (rev 424)
@@ -61,10 +61,12 @@
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\lib\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\lib\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\lib\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\lib\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
@@ -78,7 +80,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -92,7 +94,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\mpir\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
@@ -113,7 +115,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -127,7 +129,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\mpir\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
@@ -145,7 +147,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -158,7 +160,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\mpir\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
@@ -179,7 +181,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -192,7 +194,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\mpir\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Lib>
     <PostBuildEvent>
       <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>

Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -101,7 +101,7 @@
       <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
       <GenerateMapFile>true</GenerateMapFile>
@@ -112,12 +112,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -130,7 +131,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -145,7 +146,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -155,12 +156,13 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -174,7 +176,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -187,7 +189,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -198,12 +200,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -216,7 +219,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -229,7 +232,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -240,7 +243,8 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj	2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=12;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -101,7 +101,7 @@
       <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
       <GenerateMapFile>true</GenerateMapFile>
@@ -112,12 +112,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -130,7 +131,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -145,7 +146,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -155,12 +156,13 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -174,7 +176,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=12;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -187,7 +189,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -198,12 +200,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -216,7 +219,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -229,7 +232,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -240,7 +243,8 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=13;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -98,7 +98,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve13.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -108,12 +108,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -126,7 +127,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,7 +141,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve13.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -150,12 +151,13 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -168,7 +170,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=13;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -181,7 +183,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -192,12 +194,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -210,7 +213,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -223,7 +226,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -234,7 +237,8 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj	2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=14;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -98,7 +98,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve14.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -108,12 +108,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -126,7 +127,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,7 +141,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve14.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -150,12 +151,13 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -168,7 +170,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=14;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -181,7 +183,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -192,12 +194,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -210,7 +213,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -223,7 +226,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -234,7 +237,8 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj	2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=15;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -98,7 +98,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve15.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -108,12 +108,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -126,7 +127,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,7 +141,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)latsieve15.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -150,12 +151,13 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -168,7 +170,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=15;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -181,7 +183,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -192,12 +194,13 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PreBuildEvent>
-      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" &gt;..\..\include\version.h)
+      <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" &gt;..\..\include\version.h)
 set Wd=..\..\src\lasieve4
 if not exist %Wd%\asm (echo creating %Wd%\asm &amp;&amp; md %Wd%\asm)
 call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -210,7 +213,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
@@ -223,7 +226,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -234,7 +237,8 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj	2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Conf...
 
[truncated message content]

[Ggnfs-commits] SF.net SVN: ggnfs:[423] trunk/build.vc10

From: <brg...@us...> - 2011-11-21 21:36:53

Revision: 423
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=423&view=rev
Author:   brgladman
Date:     2011-11-21 21:36:46 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Add the _WIN64 define to the compiler command line for x64 builds

Modified Paths:
--------------
    trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
    trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
    trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
    trunk/build.vc10/makefb/makefb.vcxproj
    trunk/build.vc10/matbuild/matbuild.vcxproj
    trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
    trunk/build.vc10/matprune/matprune.vcxproj
    trunk/build.vc10/matsolve/matsolve.vcxproj
    trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
    trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
    trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
    trunk/build.vc10/pol51opt/pol51opt.vcxproj
    trunk/build.vc10/pol51optx/pol51optx.vcxproj
    trunk/build.vc10/polyselect/polyselect.vcxproj
    trunk/build.vc10/procrels/procrels.vcxproj
    trunk/build.vc10/sieve/sieve.vcxproj
    trunk/build.vc10/sqrt/sqrt.vcxproj

Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -114,7 +114,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -180,7 +180,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -131,7 +131,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <SmallerTypeCheck>false</SmallerTypeCheck>
@@ -217,7 +217,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -131,7 +131,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <SmallerTypeCheck>false</SmallerTypeCheck>
@@ -217,7 +217,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -127,7 +127,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -211,7 +211,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -127,7 +127,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -211,7 +211,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -127,7 +127,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -211,7 +211,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -127,7 +127,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=16;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=16;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -211,7 +211,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=16;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=16;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/makefb/makefb.vcxproj
===================================================================
--- trunk/build.vc10/makefb/makefb.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/makefb/makefb.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;_MAKEFB_STANDALONE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;_MAKEFB_STANDALONE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;_MAKEFB_STANDALONE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;_MAKEFB_STANDALONE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/matbuild/matbuild.vcxproj
===================================================================
--- trunk/build.vc10/matbuild/matbuild.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/matbuild/matbuild.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

Modified: trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
===================================================================
--- trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;GGNFS_TPIE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;WIN32;_DEBUG;_CONSOLE;GGNFS_TPIE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

Modified: trunk/build.vc10/matprune/matprune.vcxproj
===================================================================
--- trunk/build.vc10/matprune/matprune.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/matprune/matprune.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

Modified: trunk/build.vc10/matsolve/matsolve.vcxproj
===================================================================
--- trunk/build.vc10/matsolve/matsolve.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/matsolve/matsolve.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0b/pol51m0b.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51m0b/pol51m0b.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

Modified: trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0n/pol51m0n.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51m0n/pol51m0n.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

Modified: trunk/build.vc10/pol51opt/pol51opt.vcxproj
===================================================================
--- trunk/build.vc10/pol51opt/pol51opt.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51opt/pol51opt.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

Modified: trunk/build.vc10/polyselect/polyselect.vcxproj
===================================================================
--- trunk/build.vc10/polyselect/polyselect.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/polyselect/polyselect.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/procrels/procrels.vcxproj
===================================================================
--- trunk/build.vc10/procrels/procrels.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/procrels/procrels.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/sieve/sieve.vcxproj
===================================================================
--- trunk/build.vc10/sieve/sieve.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/sieve/sieve.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

Modified: trunk/build.vc10/sqrt/sqrt.vcxproj
===================================================================
--- trunk/build.vc10/sqrt/sqrt.vcxproj	2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/sqrt/sqrt.vcxproj	2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
       <Optimization>Disabled</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeader>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[422] trunk/src/experimental/lasieve4_64/x64

From: <brg...@us...> - 2011-10-23 19:58:45

Revision: 422
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=422&view=rev
Author:   brgladman
Date:     2011-10-23 19:58:39 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
More Windows x64 assembler errors

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm
    trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm
    trunk/src/experimental/lasieve4_64/x64/siever-config.h

Modified: trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm	2011-10-23 16:20:46 UTC (rev 421)
+++ trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm	2011-10-23 19:58:39 UTC (rev 422)
@@ -248,6 +248,9 @@
         movdqa  xmm2, xmm11
         pmuludq xmm11, xmm8
         sub     rsp, 32
+        mov     r8, rdx
+        mov     rdx, rsi
+        mov     rcx, rdi
         call    get_recurrence_info
         add     rsp, 32
         mov     esi, r15d
@@ -256,6 +259,9 @@
         pmuludq xmm11, xmm2
         movdqa  xmm0, xmm8
         sub     rsp, 32
+        mov     r8, rdx
+        mov     rdx, rsi
+        mov     rcx, rdi
         call    get_recurrence_info
         add     rsp, 32
         cmp     r14, r12

Modified: trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm	2011-10-23 16:20:46 UTC (rev 421)
+++ trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm	2011-10-23 19:58:39 UTC (rev 422)
@@ -259,6 +259,9 @@
         movdqa  xmm2, xmm11
         pmuludq xmm11, xmm8
         sub     rsp, 32        
+        mov     r8, rdx
+        mov     rdx, rsi
+        mov     rcx, rdi
         call    get_recurrence_info
         add     rsp, 32
         mov     esi, ebx
@@ -267,6 +270,9 @@
         pmuludq xmm11, xmm2
         movdqa  xmm0, xmm8
         sub     rsp, 32
+        mov     r8, rdx
+        mov     rdx, rsi
+        mov     rcx, rdi
         call    get_recurrence_info
         add     rsp, 32
         cmp     r14, r12

Modified: trunk/src/experimental/lasieve4_64/x64/siever-config.h
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/siever-config.h	2011-10-23 16:20:46 UTC (rev 421)
+++ trunk/src/experimental/lasieve4_64/x64/siever-config.h	2011-10-23 19:58:39 UTC (rev 422)
@@ -32,8 +32,14 @@
 typedef int i32_t;
 typedef short int i16_t;
 typedef unsigned short u16_t;
+#ifdef _WIN32
+typedef unsigned long long u64_t;
+typedef long long i64_t;
+#else
 typedef unsigned long u64_t;
 typedef long int i64_t;
+#endif
+
 #define U32_MAX 0xffffffff
 #define I32_MAX INT_MAX
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[421] trunk/build.vc10/lasieve.exp

From: <brg...@us...> - 2011-10-23 16:20:53

Revision: 421
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=421&view=rev
Author:   brgladman
Date:     2011-10-23 16:20:46 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
further corrections to the Windows code

Modified Paths:
--------------
    trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
    trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
    trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj
    trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters

Modified: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj	2011-10-23 16:20:46 UTC (rev 421)
@@ -99,7 +99,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters	2011-10-23 16:20:46 UTC (rev 421)
@@ -109,7 +109,7 @@
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj	2011-10-23 16:20:46 UTC (rev 421)
@@ -165,7 +165,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj	2011-10-23 16:20:46 UTC (rev 421)
@@ -165,7 +165,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters	2011-10-23 16:20:46 UTC (rev 421)
@@ -109,7 +109,7 @@
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj	2011-10-23 16:20:46 UTC (rev 421)
@@ -165,7 +165,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters	2011-10-23 16:20:46 UTC (rev 421)
@@ -109,7 +109,7 @@
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj	2011-10-23 16:20:46 UTC (rev 421)
@@ -165,7 +165,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters	2011-10-23 16:20:46 UTC (rev 421)
@@ -109,7 +109,7 @@
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj	2011-10-23 16:20:46 UTC (rev 421)
@@ -165,7 +165,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />

Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters	2011-10-23 16:20:46 UTC (rev 421)
@@ -109,7 +109,7 @@
     <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

Modified: trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj	2011-10-23 16:20:46 UTC (rev 421)
@@ -149,7 +149,7 @@
     <ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\zeit.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h" />
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h" />
     <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h" />

Modified: trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters	2011-10-22 22:24:58 UTC (rev 420)
+++ trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters	2011-10-23 16:20:46 UTC (rev 421)
@@ -55,7 +55,7 @@
     <ClInclude Include="..\..\unistd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h">
+    <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[420] trunk/src/experimental/lasieve4_64/x64

From: <brg...@us...> - 2011-10-22 22:25:04

Revision: 420
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=420&view=rev
Author:   brgladman
Date:     2011-10-22 22:24:58 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
correct Windows assembler handling of RIP relative addressing

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm
    trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm
    trunk/src/experimental/lasieve4_64/x64/modinv1000.asm
    trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm
    trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm
    trunk/src/experimental/lasieve4_64/x64/pt64.asm

Modified: trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm	2011-10-22 22:07:05 UTC (rev 419)
+++ trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm	2011-10-22 22:24:58 UTC (rev 420)
@@ -178,17 +178,17 @@
         psrldq  xmm7, 8
         mov     esi, ebx
         pmuludq xmm12, xmm2
+        sub     rsp, 32
+        call    asm_modinv32b
         add     rsp, 32
-        call    asm_modinv32b
-        sub     rsp, 32
         movd    edi, xmm7
         pmuludq xmm12, xmm0
         movd    xmm11, eax
         mov     esi, r15d
         pxor    xmm10, xmm10
+        sub     rsp, 32
+        call    asm_modinv32b
         add     rsp, 32
-        call    asm_modinv32b
-        sub     rsp, 32
         movd    xmm8, eax
         psubq   xmm9, xmm12
         mov     rax, [r12]
@@ -247,17 +247,17 @@
         psrldq  xmm7, 8
         movdqa  xmm2, xmm11
         pmuludq xmm11, xmm8
+        sub     rsp, 32
+        call    get_recurrence_info
         add     rsp, 32
-        call    get_recurrence_info
-        sub     rsp, 32
         mov     esi, r15d
         lea     rdi, [r13+8]
         movd    edx, xmm7
         pmuludq xmm11, xmm2
         movdqa  xmm0, xmm8
+        sub     rsp, 32
+        call    get_recurrence_info
         add     rsp, 32
-        call    get_recurrence_info
-        sub     rsp, 32
         cmp     r14, r12
         pslld   xmm2, 1
         pshufd  xmm12, xmm1, 0x98

Modified: trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm	2011-10-22 22:07:05 UTC (rev 419)
+++ trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm	2011-10-22 22:24:58 UTC (rev 420)
@@ -191,9 +191,9 @@
         pshufd  xmm8, xmm8, 0x4e
         mov     esi, ebx
         pmuludq xmm12, xmm2
-        add     rsp, 32        
+        sub     rsp, 32        
         call    asm_modinv32b
-        sub     rsp, 32
+        add     rsp, 32
 %if %1 * (%1 - 3) == 0  
         sub     r15d, eax
 %endif  
@@ -258,17 +258,17 @@
         psrldq  xmm7, 8
         movdqa  xmm2, xmm11
         pmuludq xmm11, xmm8
-        add     rsp, 32        
+        sub     rsp, 32        
         call    get_recurrence_info
-        sub     rsp, 32
+        add     rsp, 32
         mov     esi, ebx
         lea     rdi, [r13+8]
         movd    edx, xmm7
         pmuludq xmm11, xmm2
         movdqa  xmm0, xmm8
+        sub     rsp, 32
+        call    get_recurrence_info
         add     rsp, 32
-        call    get_recurrence_info
-        sub     rsp, 32
         cmp     r14, r12
         pslld   xmm2, 1
         pshufd  xmm12, xmm1, 0x98

Modified: trunk/src/experimental/lasieve4_64/x64/modinv1000.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/modinv1000.asm	2011-10-22 22:07:05 UTC (rev 419)
+++ trunk/src/experimental/lasieve4_64/x64/modinv1000.asm	2011-10-22 22:24:58 UTC (rev 420)
@@ -75,9 +75,9 @@
         mov     eax, [rel modulo32]
         sub     eax, r8d
         ret
-.6:     add     rsp, 32
+.6:     sub     rsp, 32
         call    abort
-        sub     rsp, 32
+        add     rsp, 32
  
         end
            
\ No newline at end of file

Modified: trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm	2011-10-22 22:07:05 UTC (rev 419)
+++ trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm	2011-10-22 22:24:58 UTC (rev 420)
@@ -80,9 +80,9 @@
         sub     eax, r8d
         ret     
 .6:     je      .8
-.7:     add     rsp, 32
+.7:     sub     rsp, 32
         call    abort
-        sub     rsp, 32
+        add     rsp, 32
 .8:     xor     eax, eax
         ret     
 

Modified: trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm	2011-10-22 22:07:05 UTC (rev 419)
+++ trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm	2011-10-22 22:24:58 UTC (rev 420)
@@ -278,9 +278,9 @@
 .16:    xor     rax, rax
         emms    
         EXIT_PROC reg_save_list
-.17:    add     rsp, 32
+.17:    sub     rsp, 32
         call    abort
-        sub     rsp, 32
+        add     rsp, 32
         END_PROC reg_save_list
 
         end

Modified: trunk/src/experimental/lasieve4_64/x64/pt64.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/pt64.asm	2011-10-22 22:07:05 UTC (rev 419)
+++ trunk/src/experimental/lasieve4_64/x64/pt64.asm	2011-10-22 22:24:58 UTC (rev 420)
@@ -60,9 +60,9 @@
         mov     rcx, rax        
         mov     r11, rsi
         jmp     .5
-.4:     add     rsp,32
+.4:     sub     rsp,32
         call    modsq64
-        sub     rsp, 32
+        add     rsp, 32
         test    r9, rcx
         jz      .6
 .5:     xor     rax, rax
@@ -81,9 +81,9 @@
         je      .9
         dec     r10
         jz      .8
+        sub     rsp, 32
+        call    modsq64
         add     rsp, 32
-        call    modsq64
-        sub     rsp, 32
         jmp     .7
         
         align   8

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[419] trunk/src/experimental/lasieve4_64/x64

From: <brg...@us...> - 2011-10-22 22:07:12

Revision: 419
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=419&view=rev
Author:   brgladman
Date:     2011-10-22 22:07:05 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
correct Windows assembler handling of RIP relative addressing

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/x64/asm-zeit.asm
    trunk/src/experimental/lasieve4_64/x64/mpqs_gauss.asm
    trunk/src/experimental/lasieve4_64/x64/mpqs_sieve.asm
    trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm

Modified: trunk/src/experimental/lasieve4_64/x64/asm-zeit.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/asm-zeit.asm	2011-10-22 19:20:40 UTC (rev 418)
+++ trunk/src/experimental/lasieve4_64/x64/asm-zeit.asm	2011-10-22 22:07:05 UTC (rev 419)
@@ -16,16 +16,16 @@
         rdtsc   
         shl     rdx, 32
         or      rax, rdx
-        mov     rdx, [rip+asmzeitcounter]
-        sub     [rdx+rdi*8], rax
+        mov     rdx, [rel asmzeitcounter]
+        sub     [rdx+rcx*8], rax
         ret     
         
         LEAF_PROC zeitB
         rdtsc   
         shl     rdx, 32
         or      rax, rdx
-        mov     rdx, [rip+asmzeitcounter]
-        add     [rdx+rdi*8], rax
+        mov     rdx, [rel asmzeitcounter]
+        add     [rdx+rcx*8], rax
         ret     
     
         end

Modified: trunk/src/experimental/lasieve4_64/x64/mpqs_gauss.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/mpqs_gauss.asm	2011-10-22 19:20:40 UTC (rev 418)
+++ trunk/src/experimental/lasieve4_64/x64/mpqs_gauss.asm	2011-10-22 22:07:05 UTC (rev 419)
@@ -28,10 +28,10 @@
 
         FRAME_PROC asm_gauss, 0, reg_save_list
 
-.1:     mov     eax, [rip+mpqs_gauss_k]
+.1:     mov     eax, [rel mpqs_gauss_k]
         dec     eax
         mov     r8d, 1
-        mov     [rip+mpqs_gauss_k], eax
+        mov     [rel mpqs_gauss_k], eax
         jl      .14
         mov     ecx, eax
         and     ecx, 31
@@ -39,31 +39,31 @@
         mov     ecx, eax
         shr     ecx, 5    ; %r11d 
         mov     r11d, ecx      
-        mov     ecx, [rip+mpqs_gauss_j]
+        mov     ecx, [rel mpqs_gauss_j]
         mov     rdi, mpqs_gauss_c
         
-        mov     rsi, [rip+mpqs_gauss_row]
+        mov     rsi, [rel mpqs_gauss_row]
         mov     eax, r11d
-        mov     edx, [rip+mpqs_gauss_n32]
+        mov     edx, [rel mpqs_gauss_n32]
         mov     rsi, [rsi+rcx*8]
         sub     rax, rdx
         dec     ecx
         lea     rsi, [rsi+rax*4]
-        mov     eax, [rip+mpqs_gauss_n32]
+        mov     eax, [rel mpqs_gauss_n32]
         
         align   16
 .2:     inc     ecx
-.3:     cmp     ecx, [rip+mpqs_gauss_m]
+.3:     cmp     ecx, [rel mpqs_gauss_m]
         jnc     .15
         lea     rsi, [rsi+rax*4]
         mov     edx, [rsi]
         and     edx, r8d
         jz      .2        
-.4:     cmp     ecx, [rip+mpqs_gauss_j]
+.4:     cmp     ecx, [rel mpqs_gauss_j]
         jz      .7
-        mov     rsi, [rip+mpqs_gauss_row]
+        mov     rsi, [rel mpqs_gauss_row]
         mov     rax, [rsi+rcx*8]    ; mpqs_gauss_row[j] 
-        mov     edx, [rip+mpqs_gauss_j]
+        mov     edx, [rel mpqs_gauss_j]
         mov     r9, [rsi+rdx*8]    ; mpqs_gauss_row[mpqs_gauss_j] 
         xor     rdx, rdx
 .5:     movq    mm0, [rax+rdx*4]
@@ -71,20 +71,20 @@
         movq    [r9+rdx*4], mm0
         movq    [rax+rdx*4], mm1
         add     rdx, 2
-        cmp     edx, [rip+mpqs_gauss_n32]
+        cmp     edx, [rel mpqs_gauss_n32]
         jc      .5    
-.6:     mov     ecx, [rip+mpqs_gauss_j]
+.6:     mov     ecx, [rel mpqs_gauss_j]
 .7:     mov     rsi, mpqs_gauss_d
-        mov     eax, [rip+mpqs_gauss_k]
+        mov     eax, [rel mpqs_gauss_k]
         mov     [rsi+rax*2], cx
         mov     [rdi+rcx*2], ax
-        inc     dword[rip+mpqs_gauss_j]
+        inc     dword[rel mpqs_gauss_j]
         mov     r10d, ecx
-        mov     rsi, [rip+mpqs_gauss_mat]
+        mov     rsi, [rel mpqs_gauss_mat]
         mov     rdi, mpqs_gauss_col
         mov     edx, r11d
         test    ecx, ecx
-        mov     eax, [rip+mpqs_gauss_n32]
+        mov     eax, [rel mpqs_gauss_n32]
         lea     rsi, [rsi+rdx*4]
         mov     rdx, 2
         jz      .9
@@ -102,7 +102,7 @@
         lea     rsi, [rsi+rax*4]
         jc      .8
 .9:     inc     ecx
-        cmp     ecx, [rip+mpqs_gauss_m]
+        cmp     ecx, [rel mpqs_gauss_m]
         lea     rsi, [rsi+rax*4]
         jnc     .11
         
@@ -114,14 +114,14 @@
         cmovnz  r9, rdx
         inc     rcx
         add     rdi, r9
-        cmp     ecx, [rip+mpqs_gauss_m]
+        cmp     ecx, [rel mpqs_gauss_m]
         lea     rsi, [rsi+rax*4]
         jc      .10
 .11:    mov     r8, mpqs_gauss_col
         cmp     rdi, r8
         jz      .1
         mov     ecx, r10d
-        mov     rsi, [rip+mpqs_gauss_row]
+        mov     rsi, [rel mpqs_gauss_row]
         mov     rsi, [rsi+rcx*8]   
         mov     edx, r11d
         cmp     edx, 2
@@ -133,7 +133,7 @@
 
         align   16
 .12:    movzx   r9, word[r8]
-        mov     rax, [rip+mpqs_gauss_row]
+        mov     rax, [rel mpqs_gauss_row]
         mov     rax, [rax+r9*8]
         xor     ecx, ecx
 .13:    mov     edx, [rsi+rcx*4]
@@ -150,14 +150,14 @@
         EXIT_PROC reg_save_list
         
 .15:    mov     rdi, mpqs_gauss_d
-        mov     eax, [rip+mpqs_gauss_k]
+        mov     eax, [rel mpqs_gauss_k]
         mov     r9w, -1
         mov     [rdi+rax*2], r9w
         mov     r10d, ecx
         jmp     .14        
 .16     movzx   r9, word[r8]
         movq    mm0, [rsi]
-        mov     rsi, [rip+mpqs_gauss_row]
+        mov     rsi, [rel mpqs_gauss_row]
         mov     rax, [rsi+r9*8]
 .17:    movq    mm1, [rax]
         lea     r8, [r8+2]
@@ -171,7 +171,7 @@
 .18:    movq    mm0, [rsi]
         movzx   r9, word[r8]
         movq    mm2, [rsi+8]
-        mov     rsi, [rip+mpqs_gauss_row]
+        mov     rsi, [rel mpqs_gauss_row]
         mov     rax, [rsi+r9*8]
 .19:    movq    mm1, [rax]
         lea     r8, [r8+2]
@@ -189,7 +189,7 @@
         movzx   r9, word[r8]
         movq    mm2, [rsi+8]
         movq    mm4, [rsi+16]
-        mov     rsi, [rip+mpqs_gauss_row]
+        mov     rsi, [rel mpqs_gauss_row]
         mov     rax, [rsi+r9*8]
 .21:    movq    mm1, [rax]
         lea     r8, [r8+2]

Modified: trunk/src/experimental/lasieve4_64/x64/mpqs_sieve.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/mpqs_sieve.asm	2011-10-22 19:20:40 UTC (rev 418)
+++ trunk/src/experimental/lasieve4_64/x64/mpqs_sieve.asm	2011-10-22 22:07:05 UTC (rev 419)
@@ -17,8 +17,8 @@
 
         FRAME_PROC asm_sieve, 0, reg_save_list 
 
-        movzx   rax, word[rip+mpqs_sievebegin]
-        movzx   r10, word[rip+mpqs_sievelen]
+        movzx   rax, word[rel mpqs_sievebegin]
+        movzx   r10, word[rel mpqs_sievelen]
         mov     rcx, mpqs_FB
         mov     r8, mpqs_FB_start
         mov     r9, mpqs_FB_log
@@ -27,7 +27,7 @@
         lea     r9, [r9+rax]
         mov     r11, r10
         shr     r10, 2
-        mov     r13, [rip+mpqs_sievearray]
+        mov     r13, [rel mpqs_sievearray]
         mov     r15, r13
         add     r15, r11
         

Modified: trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm	2011-10-22 19:20:40 UTC (rev 418)
+++ trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm	2011-10-22 22:07:05 UTC (rev 419)
@@ -58,10 +58,10 @@
         pxor    xmm5, xmm5
         
         movzx   r9, word[rdi+8]    ; %r9         
-        movzx   rcx, word[rip+mpqs_td_begin]
+        movzx   rcx, word[rel mpqs_td_begin]
         mov     rbx, mpqs_FB_inv_info
         mov     r11, mpqs_FB_start
-        mov     r13w, [rip+mpqs_nFBk_1]
+        mov     r13w, [rel mpqs_nFBk_1]
         add     r13w, 4
         movaps  xmm0, [rbx]
         movaps  xmm1, [rbx+16]
@@ -139,7 +139,7 @@
         jmp     .1
 .2:   
         mov     r10, mpqs_FB
-        movzx   rdx, word[rip+mpqs_nFBk_1]
+        movzx   rdx, word[rel mpqs_nFBk_1]
         add     rdx, rdx
         add     rdx, rdx
         sub     r10, rdx
@@ -163,7 +163,7 @@
         inc     r9
         cmp     r9, 27
         jnc     .16
-        mov     cx, [rip+mpqs_nFBk_1]
+        mov     cx, [rel mpqs_nFBk_1]
         mov     [rdi+r9*2+8], cx
         shr     r8, 1
         jmp     .5  
@@ -195,7 +195,7 @@
         mul     r11d
         mov     r8d, eax
         mov     r11, mpqs_FB_inv
-        movzx   rcx,  word[rip+mpqs_nFBk_1]
+        movzx   rcx,  word[rel mpqs_nFBk_1]
         add     rcx, rcx
         add     rcx, rcx
         sub     r11, rcx
@@ -223,7 +223,7 @@
         jz      .15  
         mov     r11, mpqs_FBk_inv
         mov     r10, mpqs_FBk
-        movzx   rsi, word[rip+mpqs_nFBk]
+        movzx   rsi, word[rel mpqs_nFBk]
         inc     rsi
 .10:    dec     rsi
         mov     eax, r8d
@@ -247,8 +247,8 @@
         jz      .15  
         mov     r11, mpqs_FB_A_inv
         mov     r10, mpqs_Adiv_all
-        mov     r13w, [rip+mpqs_nFB]
-        add     r13w, [rip+mpqs_nFBk]
+        mov     r13w, [rel mpqs_nFB]
+        add     r13w, [rel mpqs_nFBk]
         movzx   rsi, word[mpqs_nAdiv_total]
         inc     rsi
 .13:    dec     rsi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[418] trunk/src/experimental/lasieve4_64/x64

From: <brg...@us...> - 2011-10-22 19:20:47

Revision: 418
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=418&view=rev
Author:   brgladman
Date:     2011-10-22 19:20:40 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
update Windows x64 assembler code

Modified Paths:
--------------
    trunk/src/experimental/lasieve4_64/x64/MMX-TD1.asm
    trunk/src/experimental/lasieve4_64/x64/MMX-TD2.asm
    trunk/src/experimental/lasieve4_64/x64/lasched0.asm
    trunk/src/experimental/lasieve4_64/x64/lasched1.asm
    trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm
    trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm
    trunk/src/experimental/lasieve4_64/x64/medsched0.asm
    trunk/src/experimental/lasieve4_64/x64/modinv1000.asm
    trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm
    trunk/src/experimental/lasieve4_64/x64/mpqs_sieveinit.asm
    trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm
    trunk/src/experimental/lasieve4_64/x64/pt64.asm
    trunk/src/experimental/lasieve4_64/x64/search0.asm
    trunk/src/experimental/lasieve4_64/x64/slinie1A.asm
    trunk/src/experimental/lasieve4_64/x64/slinie2A.asm
    trunk/src/experimental/lasieve4_64/x64/slinie3A.asm
    trunk/src/experimental/lasieve4_64/x64/tdsieve-from-sched.asm

Modified: trunk/src/experimental/lasieve4_64/x64/MMX-TD1.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/MMX-TD1.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/MMX-TD1.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -14,7 +14,7 @@
         mov     rdi, rcx
         mov     esi, edx
         mov     rdx, r8
-        mov     ecx, r9d
+        mov     rcx, r9
 
         mov     r8d, esi
         movq    mm2, [rdx]

Modified: trunk/src/experimental/lasieve4_64/x64/MMX-TD2.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/MMX-TD2.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/MMX-TD2.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -14,7 +14,7 @@
         mov     rdi, rcx
         mov     esi, edx
         mov     rdx, r8
-        mov     ecx, r9d
+        mov     rcx, r9
 
         mov     r8d, esi
         movdqa  xmm2, [rdx]

Modified: trunk/src/experimental/lasieve4_64/x64/lasched0.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasched0.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/lasched0.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -23,7 +23,7 @@
         mov     rdx,  r8
         mov     ecx, r9d
         mov      r8, [rsp+stack_use+40]
-        mov     r9d, dword [rsp+stack_use+48]
+        mov     r9d, [rsp+stack_use+48]
 
         shl     rcx, n_i_bits
         mov     eax, [rsi]

Modified: trunk/src/experimental/lasieve4_64/x64/lasched1.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasched1.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/lasched1.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -23,7 +23,7 @@
         mov     rdx,  r8
         mov     ecx, r9d
         mov      r8, [rsp+stack_use+40]
-        mov     r9d, dword [rsp+stack_use+48]
+        mov     r9d, [rsp+stack_use+48]
 
         shl     rcx, n_i_bits
         shr     r9, 16

Modified: trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -178,13 +178,17 @@
         psrldq  xmm7, 8
         mov     esi, ebx
         pmuludq xmm12, xmm2
+        add     rsp, 32
         call    asm_modinv32b
+        sub     rsp, 32
         movd    edi, xmm7
         pmuludq xmm12, xmm0
         movd    xmm11, eax
         mov     esi, r15d
         pxor    xmm10, xmm10
+        add     rsp, 32
         call    asm_modinv32b
+        sub     rsp, 32
         movd    xmm8, eax
         psubq   xmm9, xmm12
         mov     rax, [r12]
@@ -243,13 +247,17 @@
         psrldq  xmm7, 8
         movdqa  xmm2, xmm11
         pmuludq xmm11, xmm8
+        add     rsp, 32
         call    get_recurrence_info
+        sub     rsp, 32
         mov     esi, r15d
         lea     rdi, [r13+8]
         movd    edx, xmm7
         pmuludq xmm11, xmm2
         movdqa  xmm0, xmm8
+        add     rsp, 32
         call    get_recurrence_info
+        sub     rsp, 32
         cmp     r14, r12
         pslld   xmm2, 1
         pshufd  xmm12, xmm1, 0x98

Modified: trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -191,7 +191,9 @@
         pshufd  xmm8, xmm8, 0x4e
         mov     esi, ebx
         pmuludq xmm12, xmm2
+        add     rsp, 32        
         call    asm_modinv32b
+        sub     rsp, 32
 %if %1 * (%1 - 3) == 0  
         sub     r15d, eax
 %endif  
@@ -256,13 +258,17 @@
         psrldq  xmm7, 8
         movdqa  xmm2, xmm11
         pmuludq xmm11, xmm8
+        add     rsp, 32        
         call    get_recurrence_info
+        sub     rsp, 32
         mov     esi, ebx
         lea     rdi, [r13+8]
         movd    edx, xmm7
         pmuludq xmm11, xmm2
         movdqa  xmm0, xmm8
+        add     rsp, 32
         call    get_recurrence_info
+        sub     rsp, 32
         cmp     r14, r12
         pslld   xmm2, 1
         pshufd  xmm12, xmm1, 0x98

Modified: trunk/src/experimental/lasieve4_64/x64/medsched0.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/medsched0.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/medsched0.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -15,7 +15,7 @@
         mov     rsi, rdx
         mov     rdx,  r8
         mov     rcx,  r9
-        mov     r8d, dword [rsp+stack_use+40]
+        mov     r8d, [rsp+stack_use+40]
         
         shl     r8d, 16
         cmp     rdx, rsi

Modified: trunk/src/experimental/lasieve4_64/x64/modinv1000.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/modinv1000.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/modinv1000.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -75,7 +75,9 @@
         mov     eax, [rel modulo32]
         sub     eax, r8d
         ret
-.6:     call    abort
+.6:     add     rsp, 32
+        call    abort
+        sub     rsp, 32
  
         end
            
\ No newline at end of file

Modified: trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -80,7 +80,9 @@
         sub     eax, r8d
         ret     
 .6:     je      .8
-.7:     call    abort
+.7:     add     rsp, 32
+        call    abort
+        sub     rsp, 32
 .8:     xor     eax, eax
         ret     
 

Modified: trunk/src/experimental/lasieve4_64/x64/mpqs_sieveinit.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/mpqs_sieveinit.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/mpqs_sieveinit.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -25,8 +25,8 @@
         mov     esi, edx
         mov     rdx, r8
         mov     rcx, r9
-        mov      r8, [rsp+stack_use+40]
-        mov      r9d, [rsp+stack_use+48]
+        mov     r8, [rsp+stack_use+40]
+        mov     r9d, [rsp+stack_use+48]
 
         mov     rbx, rdx
         mov     rcx, [rcx]
@@ -70,8 +70,8 @@
         mov     esi, edx
         mov     rdx, r8
         mov     rcx, r9
-        mov      r8, [rsp+stack_use+40]
-        mov      r9d, [rsp+stack_use+48]
+        mov     r8, [rsp+stack_use+40]
+        mov     r9d, [rsp+stack_use+48]
 
         mov     rbx, rdx
         mov     rcx, [rcx]

Modified: trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -278,7 +278,9 @@
 .16:    xor     rax, rax
         emms    
         EXIT_PROC reg_save_list
-.17:    call    abort
+.17:    add     rsp, 32
+        call    abort
+        sub     rsp, 32
         END_PROC reg_save_list
 
         end

Modified: trunk/src/experimental/lasieve4_64/x64/pt64.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/pt64.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/pt64.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -60,7 +60,9 @@
         mov     rcx, rax        
         mov     r11, rsi
         jmp     .5
-.4:     call    modsq64
+.4:     add     rsp,32
+        call    modsq64
+        sub     rsp, 32
         test    r9, rcx
         jz      .6
 .5:     xor     rax, rax
@@ -79,7 +81,9 @@
         je      .9
         dec     r10
         jz      .8
+        add     rsp, 32
         call    modsq64
+        sub     rsp, 32
         jmp     .7
         
         align   8

Modified: trunk/src/experimental/lasieve4_64/x64/search0.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/search0.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/search0.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -1,6 +1,6 @@
 
-; lasieve_search0(uchar*, uchar*, uchar*, uchar*,   uchar*,   u16_t*, uchar*);
-; GAS    rax         rdi,     rsi,   rdx,    rcx,       r8,       r9, [rsp+8]
+; lasieve_search0(uchar*, uchar*, uchar*, uchar*,   uchar*,   u16_t*,  uchar*);
+; GAS    rax         rdi,     rsi,   rdx,    rcx,       r8,       r9,  [rsp+8]
 ; YASM   rax         rcx,     rdx,    r8,     r9, [rsp+40], [rsp+48], [rsp+56],
 
 %include "ls-defs.inc"
@@ -15,9 +15,9 @@
         mov     rsi, rdx
         mov     rdx, r8
         mov     rcx, r9
-        mov     r8, qword [rsp+stack_use+40]
-        mov     r9, qword [rsp+stack_use+48]
-        mov     r14, qword [rsp+stack_use+56]
+        mov      r8, [rsp+stack_use+40]
+        mov      r9, [rsp+stack_use+48]
+        mov     r14, [rsp+stack_use+56]
 
         mov     r10, rdi
         lea     r15, [rdi+128]

Modified: trunk/src/experimental/lasieve4_64/x64/slinie1A.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/slinie1A.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/slinie1A.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -77,6 +77,10 @@
 %define j_per_strip_minus1  1
         
         FRAME_PROC slinie1, 0, reg_save_list
+        mov     rdi, rcx
+        mov     rsi, rdx
+        mov     rdx,  r8
+
         cmp     rsi, rdi
         jbe     .3
         sub     rsi, 8

Modified: trunk/src/experimental/lasieve4_64/x64/slinie2A.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/slinie2A.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/slinie2A.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -81,6 +81,9 @@
 %define j_per_strip_minus1  1
         
         FRAME_PROC slinie2, 0, reg_save_list
+        mov     rdi, rcx
+        mov     rsi, rdx
+        mov     rdx,  r8
 
         cmp     rsi, rdi
         jbe     .3

Modified: trunk/src/experimental/lasieve4_64/x64/slinie3A.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/slinie3A.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/slinie3A.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -87,6 +87,9 @@
 %define j_per_strip_minus1  1
         
         FRAME_PROC slinie3, 0, reg_save_list
+        mov     rdi, rcx
+        mov     rsi, rdx
+        mov     rdx,  r8
 
         cmp     rsi, rdi
         jbe     .3

Modified: trunk/src/experimental/lasieve4_64/x64/tdsieve-from-sched.asm
===================================================================
--- trunk/src/experimental/lasieve4_64/x64/tdsieve-from-sched.asm	2011-10-22 07:34:27 UTC (rev 417)
+++ trunk/src/experimental/lasieve4_64/x64/tdsieve-from-sched.asm	2011-10-22 19:20:40 UTC (rev 418)
@@ -15,7 +15,7 @@
         mov     rsi, rdx
         mov     rdx, r8
         mov     rcx, r9
-        mov      r8, qword [rsp+stack_use+40]
+        mov     r8, [rsp+stack_use+40]
 
         mov     r9, [rdi]
         lea     rsi, [rsi-12]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Ggnfs-commits] SF.net SVN: ggnfs:[417] trunk/build.vc10

From: <brg...@us...> - 2011-10-22 07:34:33

Revision: 417
          http://ggnfs.svn.sourceforge.net/ggnfs/?rev=417&view=rev
Author:   brgladman
Date:     2011-10-22 07:34:27 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
add files needed for the experimental siever

Added Paths:
-----------
    trunk/build.vc10/alloca.h
    trunk/build.vc10/asprintf.c
    trunk/build.vc10/asprintf.h
    trunk/build.vc10/vasprintf.c

Added: trunk/build.vc10/alloca.h
===================================================================
--- trunk/build.vc10/alloca.h	                        (rev 0)
+++ trunk/build.vc10/alloca.h	2011-10-22 07:34:27 UTC (rev 417)
@@ -0,0 +1,7 @@
+
+#ifndef ALLOCA_H
+#define ALLOCA_H
+
+#define alloca _alloca
+
+#endif
\ No newline at end of file

Added: trunk/build.vc10/asprintf.c
===================================================================
--- trunk/build.vc10/asprintf.c	                        (rev 0)
+++ trunk/build.vc10/asprintf.c	2011-10-22 07:34:27 UTC (rev 417)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2007, The xFTPd Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *     * Neither the name of the xFTPd Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *     * Redistributions of this project or parts of this project in any form
+ *       must retain the following aknowledgment:
+ *       "This product includes software developed by the xFTPd Project.
+ *        http://www.xftpd.com/ - http://www.xftpd.org/"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE xFTPd PROJECT ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE xFTPd PROJECT BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+/* MinGW lacks asprintf */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+int vasprintf(char **strp, const char *fmt, va_list ap)
+{
+  FILE *dev_null;
+  int arg_len;
+  
+  dev_null = fopen("nul", "w");
+  arg_len = vfprintf(dev_null, fmt, ap);
+  if(arg_len != -1) {
+    *strp = (char *)malloc((size_t)arg_len + 1);
+    arg_len = vsprintf(*strp, fmt, ap);
+  } else *strp = NULL;
+  fclose(dev_null);
+  return arg_len;
+}
+
+int asprintf(char **strp, const char *fmt, ...)
+{
+  int result;
+    
+  va_list args;
+  va_start(args, fmt);
+  result = vasprintf(strp, fmt, args);
+  va_end(args);
+  return result;
+}

Added: trunk/build.vc10/asprintf.h
===================================================================
--- trunk/build.vc10/asprintf.h	                        (rev 0)
+++ trunk/build.vc10/asprintf.h	2011-10-22 07:34:27 UTC (rev 417)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, The xFTPd Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *     * Neither the name of the xFTPd Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *     * Redistributions of this project or parts of this project in any form
+ *       must retain the following aknowledgment:
+ *       "This product includes software developed by the xFTPd Project.
+ *        http://www.xftpd.com/ - http://www.xftpd.org/"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE xFTPd PROJECT ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE xFTPd PROJECT BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* MinGW lacks asprintf */
+
+#ifndef __ASPRINTF_H
+#define __ASPRINTF_H
+
+#include <windows.h>
+
+int asprintf(char **ret, const char *fmt, ...);
+int vasprintf(char **strp, const char *fmt, va_list ap);
+
+char *bprintf(const char *fmt, ...);
+
+#endif /* __ASPRINTF_H */

Added: trunk/build.vc10/vasprintf.c
===================================================================
--- trunk/build.vc10/vasprintf.c	                        (rev 0)
+++ trunk/build.vc10/vasprintf.c	2011-10-22 07:34:27 UTC (rev 417)
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2004 Darren Tucker.
+ *
+ * Based originally on asprintf.c from OpenBSD:
+ * Copyright (c) 1997 Todd C. Miller <Tod...@co...>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef HAVE_VASPRINTF
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+#ifndef VA_COPY
+# ifdef HAVE_VA_COPY
+#  define VA_COPY(dest, src) va_copy(dest, src)
+# else
+#  ifdef HAVE___VA_COPY
+#   define VA_COPY(dest, src) __va_copy(dest, src)
+#  else
+#   define VA_COPY(dest, src) (dest) = (src)
+#  endif
+# endif
+#endif
+
+#define INIT_SZ	128
+
+int vasprintf(char **str, const char *fmt, va_list ap)
+{
+	int ret = -1;
+	va_list ap2;
+	char *string, *newstr;
+	size_t len;
+
+	VA_COPY(ap2, ap);
+	if ((string = malloc(INIT_SZ)) == NULL)
+		goto fail;
+
+	ret = vsnprintf(string, INIT_SZ, fmt, ap2);
+	if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */
+		*str = string;
+	} else if (ret == INT_MAX) { /* shouldn't happen */
+		goto fail;
+	} else {	/* bigger than initial, realloc allowing for nul */
+		len = (size_t)ret + 1;
+		if ((newstr = realloc(string, len)) == NULL) {
+			free(string);
+			goto fail;
+		} else {
+			va_end(ap2);
+			VA_COPY(ap2, ap);
+			ret = vsnprintf(newstr, len, fmt, ap2);
+			if (ret >= 0 && (size_t)ret < len) {
+				*str = newstr;
+			} else { /* failed with realloc'ed string, give up */
+				free(newstr);
+				goto fail;
+			}
+		}
+	}
+	va_end(ap2);
+	return (ret);
+
+fail:
+	*str = NULL;
+	errno = ENOMEM;
+	va_end(ap2);
+	return (-1);
+}
+#endif
+
+#ifndef HAVE_ASPRINTF
+int asprintf(char **str, const char *fmt, ...)
+{
+	va_list ap;
+	int ret;
+	
+	*str = NULL;
+	va_start(ap, fmt);
+	ret = vasprintf(str, fmt, ap);
+	va_end(ap);
+
+	return ret;
+}
+#endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

1 2 3 .. 48 > >> (Page 1 of 48)