Use nuget packages to build the Windows version.

This commit is contained in:
Ian Brown 2014-11-14 23:01:10 +00:00 committed by Jean-Philip Desjardins
parent eacf04f407
commit f1c0911a52
9 changed files with 69 additions and 67 deletions

View File

@ -2,35 +2,19 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<BOOST_PATH>path_to\boost-trunk</BOOST_PATH>
<FRAMEWORK_PATH>path_to\framework</FRAMEWORK_PATH>
<CODEGEN_PATH>path_to\codegen</CODEGEN_PATH>
<ZLIB_PATH>path_to\zlib-1.2.8</ZLIB_PATH>
<GLEW_PATH>path_to\glew-1.9.0</GLEW_PATH>
<BZLIB_PATH>path_to\bzip2-1.0.4</BZLIB_PATH>
<VTUNE_PATH>path_to\vtune</VTUNE_PATH>
<VTUNE_PATH>path_to\vtune</VTUNE_PATH>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
<ItemGroup>
<BuildMacro Include="BOOST_PATH">
<Value>$(BOOST_PATH)</Value>
</BuildMacro>
<BuildMacro Include="FRAMEWORK_PATH">
<Value>$(FRAMEWORK_PATH)</Value>
</BuildMacro>
<BuildMacro Include="CODEGEN_PATH">
<Value>$(CODEGEN_PATH)</Value>
</BuildMacro>
<BuildMacro Include="ZLIB_PATH">
<Value>$(ZLIB_PATH)</Value>
</BuildMacro>
<BuildMacro Include="GLEW_PATH">
<Value>$(GLEW_PATH)</Value>
</BuildMacro>
<BuildMacro Include="BZLIB_PATH">
<Value>$(BZLIB_PATH)</Value>
</BuildMacro>
<BuildMacro Include="VTUNE_PATH">
<Value>$(VTUNE_PATH)</Value>
</BuildMacro>

View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="ExternalDependencies.userprops" />
</ImportGroup>
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;GLEW_STATIC;_IOP_EMULATE_MODULES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(BOOST_PATH);$(ZLIB_PATH);$(BZLIB_PATH);$(FRAMEWORK_PATH)\include;$(CODEGEN_PATH)\include;$(DXSDK_DIR)Include;$(GLEW_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;uxtheme.lib;opengl32.lib;glu32.lib;dxguid.lib;glew32s.lib;dinput8.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="ExternalDependencies.userprops" />
</ImportGroup>
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_IOP_EMULATE_MODULES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(FRAMEWORK_PATH)\include;$(CODEGEN_PATH)\include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;uxtheme.lib;opengl32.lib;glu32.lib;dxguid.lib;dinput8.lib;vfw32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>

View File

@ -7,7 +7,7 @@
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalLibraryDirectories>$(BOOST_PATH)\stage32\lib;$(DXSDK_DIR)Lib\x86;$(GLEW_PATH)\lib\Release\Win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent />
</ItemDefinitionGroup>

View File

@ -7,7 +7,7 @@
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalLibraryDirectories>$(BOOST_PATH)\stage64\lib;$(DXSDK_DIR)Lib\x64;$(GLEW_PATH)\lib\Release\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent />
</ItemDefinitionGroup>

View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Play", "Play.vcxproj", "{DD535432-E59F-43CA-95AF-C0150AE3BD53}"
EndProject
@ -9,14 +9,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Framework", "..\..\Framewor
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CodeGen", "..\..\CodeGen\build_win32\CodeGen.vcxproj", "{E3521577-BFC9-4532-9B70-1F8C0D546F4A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib-1.2.8", "..\..\zlib-1.2.8\zlib-1.2.8.vcxproj", "{4A0B5134-AB23-452D-8513-8225FA178356}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FrameworkOpenGl", "..\..\Framework\build_win32\FrameworkOpenGl.vcxproj", "{482892BB-6D81-4CA4-BFD5-01A756C21292}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FrameworkDirectX", "..\..\Framework\build_win32\FrameworkDirectX.vcxproj", "{A286EAD1-ACEA-4132-ACDD-6520168BDEBB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2-1.0.6", "..\..\bzip2-1.0.6\bzip2-1.0.6.vcxproj", "{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MipsTest", "..\tools\MipsTest\MipsTest.vcxproj", "{FDDEEF2D-1ED6-44B7-B88A-912C2400EA8D}"
EndProject
Global
@ -65,18 +61,6 @@ Global
{E3521577-BFC9-4532-9B70-1F8C0D546F4A}.ReleaseWithDebugger|Win32.Build.0 = Release|Win32
{E3521577-BFC9-4532-9B70-1F8C0D546F4A}.ReleaseWithDebugger|x64.ActiveCfg = Release|x64
{E3521577-BFC9-4532-9B70-1F8C0D546F4A}.ReleaseWithDebugger|x64.Build.0 = Release|x64
{4A0B5134-AB23-452D-8513-8225FA178356}.Debug|Win32.ActiveCfg = Debug|Win32
{4A0B5134-AB23-452D-8513-8225FA178356}.Debug|Win32.Build.0 = Debug|Win32
{4A0B5134-AB23-452D-8513-8225FA178356}.Debug|x64.ActiveCfg = Debug|x64
{4A0B5134-AB23-452D-8513-8225FA178356}.Debug|x64.Build.0 = Debug|x64
{4A0B5134-AB23-452D-8513-8225FA178356}.Release|Win32.ActiveCfg = Release|Win32
{4A0B5134-AB23-452D-8513-8225FA178356}.Release|Win32.Build.0 = Release|Win32
{4A0B5134-AB23-452D-8513-8225FA178356}.Release|x64.ActiveCfg = Release|x64
{4A0B5134-AB23-452D-8513-8225FA178356}.Release|x64.Build.0 = Release|x64
{4A0B5134-AB23-452D-8513-8225FA178356}.ReleaseWithDebugger|Win32.ActiveCfg = Release|Win32
{4A0B5134-AB23-452D-8513-8225FA178356}.ReleaseWithDebugger|Win32.Build.0 = Release|Win32
{4A0B5134-AB23-452D-8513-8225FA178356}.ReleaseWithDebugger|x64.ActiveCfg = Release|x64
{4A0B5134-AB23-452D-8513-8225FA178356}.ReleaseWithDebugger|x64.Build.0 = Release|x64
{482892BB-6D81-4CA4-BFD5-01A756C21292}.Debug|Win32.ActiveCfg = Debug|Win32
{482892BB-6D81-4CA4-BFD5-01A756C21292}.Debug|Win32.Build.0 = Debug|Win32
{482892BB-6D81-4CA4-BFD5-01A756C21292}.Debug|x64.ActiveCfg = Debug|x64
@ -101,18 +85,6 @@ Global
{A286EAD1-ACEA-4132-ACDD-6520168BDEBB}.ReleaseWithDebugger|Win32.Build.0 = Release|Win32
{A286EAD1-ACEA-4132-ACDD-6520168BDEBB}.ReleaseWithDebugger|x64.ActiveCfg = Release|x64
{A286EAD1-ACEA-4132-ACDD-6520168BDEBB}.ReleaseWithDebugger|x64.Build.0 = Release|x64
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.Debug|Win32.ActiveCfg = Debug|Win32
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.Debug|Win32.Build.0 = Debug|Win32
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.Debug|x64.ActiveCfg = Debug|x64
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.Debug|x64.Build.0 = Debug|x64
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.Release|Win32.ActiveCfg = Release|Win32
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.Release|Win32.Build.0 = Release|Win32
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.Release|x64.ActiveCfg = Release|x64
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.Release|x64.Build.0 = Release|x64
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.ReleaseWithDebugger|Win32.ActiveCfg = Release|Win32
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.ReleaseWithDebugger|Win32.Build.0 = Release|Win32
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.ReleaseWithDebugger|x64.ActiveCfg = Release|x64
{8C48C11A-7C3F-4699-B62F-B0A66F0F78F7}.ReleaseWithDebugger|x64.Build.0 = Release|x64
{FDDEEF2D-1ED6-44B7-B88A-912C2400EA8D}.Debug|Win32.ActiveCfg = Debug|Win32
{FDDEEF2D-1ED6-44B7-B88A-912C2400EA8D}.Debug|Win32.Build.0 = Debug|Win32
{FDDEEF2D-1ED6-44B7-B88A-912C2400EA8D}.Debug|x64.ActiveCfg = Debug|x64

View File

@ -695,15 +695,13 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)\%(Filename).obj</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseWithDebugger|x64'">$(IntDir)\%(Filename).obj</Outputs>
</CustomBuild>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\Source\win32ui\ElfViewRes.rc" />
<ResourceCompile Include="..\Source\win32ui\Res.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\bzip2-1.0.6\bzip2-1.0.6.vcxproj">
<Project>{8c48c11a-7c3f-4699-b62f-b0a66f0f78f7}</Project>
</ProjectReference>
<ProjectReference Include="..\..\CodeGen\build_win32\CodeGen.vcxproj">
<Project>{e3521577-bfc9-4532-9b70-1f8c0d546f4a}</Project>
</ProjectReference>
@ -716,9 +714,6 @@
<ProjectReference Include="..\..\Framework\build_win32\FrameworkOpenGl.vcxproj">
<Project>{482892bb-6d81-4ca4-bfd5-01a756c21292}</Project>
</ProjectReference>
<ProjectReference Include="..\..\zlib-1.2.8\zlib-1.2.8.vcxproj">
<Project>{4a0b5134-ab23-452d-8513-8225fa178356}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="..\Source\win32ui\FrameDebugger\CheckerboardShader.fx">
@ -732,5 +727,34 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\NuGetPackages\bzip2.redist.1.0.6.11\build\native\bzip2.redist.targets" Condition="Exists('..\..\NuGet..\..\NuGetPackages\bzip2.redist.1.0.6.11\build\native\bzip2.redist.targets')" />
<Import Project="..\..\NuGetPackages\bzip2.1.0.6.11\build\native\bzip2.targets" Condition="Exists('..\..\NuGetPackages\bzip2.1.0.6.11\build\native\bzip2.targets')" />
<Import Project="..\..\NuGetPackages\zlib.redist.1.2.8.7\build\native\zlib.redist.targets" Condition="Exists('..\..\NuGetPackages\zlib.redist.1.2.8.7\build\native\zlib.redist.targets')" />
<Import Project="..\..\NuGetPackages\zlib.1.2.8.7\build\native\zlib.targets" Condition="Exists('..\..\NuGetPackages\zlib.1.2.8.7\build\native\zlib.targets')" />
<Import Project="..\..\NuGetPackages\boost.1.57.0.0\build\native\boost.targets" Condition="Exists('..\..\NuGetPackages\boost.1.57.0.0\build\native\boost.targets')" />
<Import Project="..\..\NuGetPackages\boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets" Condition="Exists('..\..\NuGetPackages\boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets')" />
<Import Project="..\..\NuGetPackages\boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets" Condition="Exists('..\..\NuGetPackages\boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" />
<Import Project="..\..\NuGetPackages\boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets" Condition="Exists('..\..\NuGetPackages\boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets')" />
<Import Project="..\..\NuGetPackages\boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets" Condition="Exists('..\..\NuGetPackages\boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets')" />
<Import Project="..\..\NuGetPackages\boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets" Condition="Exists('..\..\NuGetPackages\boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" />
<Import Project="..\..\NuGetPackages\rxd_glew.redist.1.10.0.1\build\native\rxd_glew.redist.targets" Condition="Exists('..\..\NuGetPackages\rxd_glew.redist.1.10.0.1\build\native\rxd_glew.redist.targets')" />
<Import Project="..\..\NuGetPackages\rxd_glew.1.10.0.1\build\native\rxd_glew.targets" Condition="Exists('..\..\NuGetPackages\rxd_glew.1.10.0.1\build\native\rxd_glew.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\NuGetPackages\bzip2.redist.1.0.6.11\build\native\bzip2.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\bzip2.redist.1.0.6.11\build\native\bzip2.redist.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\bzip2.1.0.6.11\build\native\bzip2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\bzip2.1.0.6.11\build\native\bzip2.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\zlib.redist.1.2.8.7\build\native\zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\zlib.redist.1.2.8.7\build\native\zlib.redist.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\zlib.1.2.8.7\build\native\zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\zlib.1.2.8.7\build\native\zlib.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\boost.1.57.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\boost.1.57.0.0\build\native\boost.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\rxd_glew.redist.1.10.0.1\build\native\rxd_glew.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\rxd_glew.redist.1.10.0.1\build\native\rxd_glew.redist.targets'))" />
<Error Condition="!Exists('..\..\NuGetPackages\rxd_glew.1.10.0.1\build\native\rxd_glew.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\NuGetPackages\rxd_glew.1.10.0.1\build\native\rxd_glew.targets'))" />
</Target>
</Project>

View File

@ -1280,6 +1280,7 @@
<None Include="..\Source\win32ui\FrameDebugger\PixelBufferViewShader.fx">
<Filter>Source Files\Win32 UI\FrameDebugger</Filter>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\Source\win32ui\Res.rc">

6
build_win32/nuget.config Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="repositorypath" value="..\..\NuGetPackages" />
</config>
</configuration>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.57.0.0" targetFramework="Native" />
<package id="boost_chrono-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_date_time-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_filesystem-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_system-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_thread-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="bzip2" version="1.0.6.11" targetFramework="Native" />
<package id="bzip2.redist" version="1.0.6.11" targetFramework="Native" />
<package id="rxd_glew" version="1.10.0.1" targetFramework="Native" />
<package id="rxd_glew.redist" version="1.10.0.1" targetFramework="Native" />
<package id="zlib" version="1.2.8.7" targetFramework="Native" />
<package id="zlib.redist" version="1.2.8.7" targetFramework="Native" />
</packages>