Update on win32 build files.

Some include and library settings are added for jenkins to match up with meeh's win32 slave. Currenly not executing on winXP even compiler and msdn claims to support it.
2014-09-27 20:08:39 +02:00
parent d04957bd15
commit 0bea006826
3 changed files with 49 additions and 18 deletions
--- a/Win32/i2pd.sln
+++ b/Win32/i2pd.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "i2pd", "i2pd.vcxproj", "{930568EC-31C9-406A-AD1C-9636DF5D8FAA}"
 EndProject
@@ -13,10 +13,15 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{930568EC-31C9-406A-AD1C-9636DF5D8FAA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{930568EC-31C9-406A-AD1C-9636DF5D8FAA}.Debug|Win32.Build.0 = Debug|Win32
+		{930568EC-31C9-406A-AD1C-9636DF5D8FAA}.Debug|Win32.Deploy.0 = Debug|Win32
 		{930568EC-31C9-406A-AD1C-9636DF5D8FAA}.Release|Win32.ActiveCfg = Release|Win32
 		{930568EC-31C9-406A-AD1C-9636DF5D8FAA}.Release|Win32.Build.0 = Release|Win32
+		{930568EC-31C9-406A-AD1C-9636DF5D8FAA}.Release|Win32.Deploy.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 EndGlobal
--- a/Win32/i2pd.vcxproj
+++ b/Win32/i2pd.vcxproj
@@ -31,6 +31,7 @@
    <ClCompile Include="..\Reseed.cpp" />
    <ClCompile Include="..\RouterContext.cpp" />
    <ClCompile Include="..\RouterInfo.cpp" />
+    <ClCompile Include="..\SAM.cpp" />
    <ClCompile Include="..\SSU.cpp" />
    <ClCompile Include="..\SSUData.cpp" />
    <ClCompile Include="..\Streaming.cpp" />
@@ -43,8 +44,7 @@
    <ClCompile Include="..\UPnP.cpp" />
    <ClCompile Include="..\util.cpp" />
    <ClCompile Include="..\SOCKS.cpp" />
-	<ClCompile Include="..\I2PTunnel.cpp" />
-	<ClCompile Include="..\SAM.cpp" />
+    <ClCompile Include="..\I2PTunnel.cpp" />
    <ClCompile Include="Win32Service.cpp" />
  </ItemGroup>
  <ItemGroup>
@@ -68,6 +68,7 @@
    <ClInclude Include="..\Reseed.h" />
    <ClInclude Include="..\RouterContext.h" />
    <ClInclude Include="..\RouterInfo.h" />
+    <ClInclude Include="..\SAM.h" />
    <ClInclude Include="..\SSU.h" />
    <ClInclude Include="..\SSUData.h" />
    <ClInclude Include="..\Streaming.h" />
@@ -83,10 +84,9 @@
    <ClInclude Include="..\UPnP.h" />
    <ClInclude Include="..\util.h" />
    <ClInclude Include="..\SOCKS.h" />
-	<ClInclude Include="..\I2PTunnel.h" />
-	<ClInclude Include="..\version.h" />
-	<ClInclude Include="..\Signature.h" />
-	<ClInclude Include="..\SAM.h" />
+    <ClInclude Include="..\I2PTunnel.h" />
+    <ClInclude Include="..\version.h" />
+    <ClInclude Include="..\Signature.h" />
    <ClInclude Include="Win32Service.h" />
  </ItemGroup>
  <PropertyGroup Label="Globals">
@@ -97,13 +97,13 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>CTP_Nov2013</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
@@ -118,14 +118,14 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>./..;$(BOOST);$(CRYPTOPP);$(IncludePath)</IncludePath>
-    <LibraryPath>$(BOOST)\stage\lib;$(CRYPTOPP)\cryptopp\Win32\Output\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <IncludePath>E:\build\cryptopp562;E:\build\boost_1_56_0;./..;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\build\cryptopp562\Win32\Output\Debug;E:\build\boost_1_56_0\stage\lib;$(LibraryPath)</LibraryPath>
    <SourcePath>./..;$(VC_SourcePath);</SourcePath>
    <TargetName>$(ProjectName)_d</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>./..;$(BOOST);$(CRYPTOPP);$(IncludePath)</IncludePath>
-    <LibraryPath>$(BOOST)\stage\lib;$(CRYPTOPP)\cryptopp\Win32\Output\$(Configuration)\;$(LibraryPath)</LibraryPath>
+    <IncludePath>E:\build\cryptopp562;E:\build\boost_1_56_0;./..;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\build\cryptopp562\Win32\Output\Release;E:\build\cryptopp562\Win32\cryptopp\Release;E:\build\boost_1_56_0\stage\lib;E:\build\cryptopp562\Win32\cryptlib\DLL-Import Release;$(LibraryPath)</LibraryPath>
    <SourcePath>./..;$(VC_SourcePath);</SourcePath>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -133,7 +133,7 @@
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <PreprocessorDefinitions>_MBCS;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
@@ -149,16 +149,24 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    </ClCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
+      <OptimizeReferences>false</OptimizeReferences>
      <AdditionalDependencies>cryptlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <Version>
+      </Version>
    </Link>
+    <Manifest>
+      <AssemblyIdentity>
+      </AssemblyIdentity>
+      <ComponentFileName>
+      </ComponentFileName>
+    </Manifest>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/Win32/i2pd.vcxproj.filters
+++ b/Win32/i2pd.vcxproj.filters
@@ -117,6 +117,12 @@
    <ClCompile Include="..\aes.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\I2PTunnel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\SAM.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\Identity.h">
@@ -227,5 +233,17 @@
    <ClInclude Include="..\SSUData.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\I2PTunnel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Signature.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\SAM.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>