Menu
▾
▴
[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] |
