From f1c0911a52d16d7069625077e9d556a5f4a5c492 Mon Sep 17 00:00:00 2001 From: Ian Brown Date: Fri, 14 Nov 2014 23:01:10 +0000 Subject: [PATCH] Use nuget packages to build the Windows version. --- .../ExternalDependencies.userprops.template | 18 +--------- build_win32/GeneralSettings.props | 26 +++++++------- build_win32/GeneralSettings32.props | 2 +- build_win32/GeneralSettings64.props | 2 +- build_win32/Play.sln | 30 +--------------- build_win32/Play.vcxproj | 36 +++++++++++++++---- build_win32/Play.vcxproj.filters | 1 + build_win32/nuget.config | 6 ++++ build_win32/packages.config | 15 ++++++++ 9 files changed, 69 insertions(+), 67 deletions(-) create mode 100644 build_win32/nuget.config create mode 100644 build_win32/packages.config diff --git a/build_win32/ExternalDependencies.userprops.template b/build_win32/ExternalDependencies.userprops.template index f870e7e7..02d84c1f 100644 --- a/build_win32/ExternalDependencies.userprops.template +++ b/build_win32/ExternalDependencies.userprops.template @@ -2,35 +2,19 @@ - path_to\boost-trunk path_to\framework path_to\codegen - path_to\zlib-1.2.8 - path_to\glew-1.9.0 - path_to\bzip2-1.0.4 - path_to\vtune + path_to\vtune - - $(BOOST_PATH) - $(FRAMEWORK_PATH) $(CODEGEN_PATH) - - $(ZLIB_PATH) - - - $(GLEW_PATH) - - - $(BZLIB_PATH) - $(VTUNE_PATH) diff --git a/build_win32/GeneralSettings.props b/build_win32/GeneralSettings.props index 663bcdf7..9a49ef45 100644 --- a/build_win32/GeneralSettings.props +++ b/build_win32/GeneralSettings.props @@ -1,16 +1,16 @@ - - - - - - - - - WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;GLEW_STATIC;_IOP_EMULATE_MODULES;%(PreprocessorDefinitions) - $(BOOST_PATH);$(ZLIB_PATH);$(BZLIB_PATH);$(FRAMEWORK_PATH)\include;$(CODEGEN_PATH)\include;$(DXSDK_DIR)Include;$(GLEW_PATH)\include;%(AdditionalIncludeDirectories) - - - comctl32.lib;uxtheme.lib;opengl32.lib;glu32.lib;dxguid.lib;glew32s.lib;dinput8.lib;vfw32.lib;%(AdditionalDependencies) + + + + + + + + + WIN32;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_IOP_EMULATE_MODULES;%(PreprocessorDefinitions) + $(FRAMEWORK_PATH)\include;$(CODEGEN_PATH)\include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories) + + + comctl32.lib;uxtheme.lib;opengl32.lib;glu32.lib;dxguid.lib;dinput8.lib;vfw32.lib;%(AdditionalDependencies) LIBCMT diff --git a/build_win32/GeneralSettings32.props b/build_win32/GeneralSettings32.props index 49ad2482..13de0467 100644 --- a/build_win32/GeneralSettings32.props +++ b/build_win32/GeneralSettings32.props @@ -7,7 +7,7 @@ - $(BOOST_PATH)\stage32\lib;$(DXSDK_DIR)Lib\x86;$(GLEW_PATH)\lib\Release\Win32;%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) diff --git a/build_win32/GeneralSettings64.props b/build_win32/GeneralSettings64.props index d16123d7..f2fe7d61 100644 --- a/build_win32/GeneralSettings64.props +++ b/build_win32/GeneralSettings64.props @@ -7,7 +7,7 @@ - $(BOOST_PATH)\stage64\lib;$(DXSDK_DIR)Lib\x64;$(GLEW_PATH)\lib\Release\x64;%(AdditionalLibraryDirectories) + $(DXSDK_DIR)Lib\x64;%(AdditionalLibraryDirectories) diff --git a/build_win32/Play.sln b/build_win32/Play.sln index 7caae9e0..3db59711 100644 --- a/build_win32/Play.sln +++ b/build_win32/Play.sln @@ -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 diff --git a/build_win32/Play.vcxproj b/build_win32/Play.vcxproj index 9afac7b0..0b7a6e9a 100644 --- a/build_win32/Play.vcxproj +++ b/build_win32/Play.vcxproj @@ -695,15 +695,13 @@ $(IntDir)\%(Filename).obj $(IntDir)\%(Filename).obj + - - {8c48c11a-7c3f-4699-b62f-b0a66f0f78f7} - {e3521577-bfc9-4532-9b70-1f8c0d546f4a} @@ -716,9 +714,6 @@ {482892bb-6d81-4ca4-bfd5-01a756c21292} - - {4a0b5134-ab23-452d-8513-8225fa178356} - @@ -732,5 +727,34 @@ + + + + + + + + + + + + + + + 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}. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build_win32/Play.vcxproj.filters b/build_win32/Play.vcxproj.filters index 67e995cc..31e0b88f 100644 --- a/build_win32/Play.vcxproj.filters +++ b/build_win32/Play.vcxproj.filters @@ -1280,6 +1280,7 @@ Source Files\Win32 UI\FrameDebugger + diff --git a/build_win32/nuget.config b/build_win32/nuget.config new file mode 100644 index 00000000..34e24235 --- /dev/null +++ b/build_win32/nuget.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/build_win32/packages.config b/build_win32/packages.config new file mode 100644 index 00000000..103db7f8 --- /dev/null +++ b/build_win32/packages.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file