diff --git a/Application_AnUnconventionalWeapon/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln b/Application_AnUnconventionalWeapon/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln index fb201eb..c910c63 100644 --- a/Application_AnUnconventionalWeapon/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln +++ b/Application_AnUnconventionalWeapon/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln @@ -8,13 +8,19 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|Win32.ActiveCfg = Debug|Win32 {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|Win32.Build.0 = Debug|Win32 + {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|x64.ActiveCfg = Debug|x64 + {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|x64.Build.0 = Debug|x64 {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|Win32.ActiveCfg = Release|Win32 {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|Win32.Build.0 = Release|Win32 + {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|x64.ActiveCfg = Release|x64 + {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Application_AnUnconventionalWeapon/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj b/Application_AnUnconventionalWeapon/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj index 803f9cf..25e1f4d 100644 --- a/Application_AnUnconventionalWeapon/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj +++ b/Application_AnUnconventionalWeapon/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {EE29564D-734F-4780-ABE1-6DC11327264F} @@ -22,6 +30,12 @@ v120 Unicode + + Application + true + v120 + Unicode + Application false @@ -29,21 +43,47 @@ true Unicode + + Application + false + v120 + true + Unicode + + + + + + + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(ProjectName)_$(Platform)_$(Configuration) false + $(ProjectName)_$(Platform)_$(Configuration) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(ProjectName)_$(Platform)_$(Configuration) @@ -67,9 +107,33 @@ ..\WorkDir\shaders\%(Filename).cso - + + + + + + + Level3 + Disabled + USES_WINDOWS8_DESKTOP;CUBEENGINE_DISABLE_OPTIM_MERGE_QUADS;_CRT_SECURE_NO_WARNINGS;USES_STEAM_INTEGRATION;VERSION_X64;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS + true + true + false + C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) + $(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\include;$(SolutionDir)\..\..\VisualStudioOtherLibs\include;C:\progs\GnuWin32\include;d:\progs\OpenAL 1.1 SDK\include;C:\Users\moi\Documents\GitHub\volatile-dove-engine;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public;%(AdditionalIncludeDirectories) + + + Windows + true + d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;$(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\lua52.lib;pthreadVC2.lib;libxml2.lib;zlib.lib;libiconv.lib;WSock32.Lib;XInput.lib;D3DCompiler.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\VisualStudioOtherLibs\lib;c:\progs\GnuWin32\lib;D:\progs\OpenAL 1.1 SDK\libs\Win32;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\redistributable_bin\win64;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public\steam\lib\win64;%(AdditionalLibraryDirectories) + + + $(SolutionDir)\.. + $(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso + @@ -96,9 +160,36 @@ ..\WorkDir\shaders\%(Filename).cso - + + + + + Level3 + + + MaxSpeed + true + true + USES_WINDOWS8_DESKTOP;CUBEENGINE_DISABLE_OPTIM_MERGE_QUADS;_CRT_SECURE_NO_WARNINGS;USES_STEAM_INTEGRATION;VERSION_X64;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS + true + true + C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) + $(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\include;$(SolutionDir)\..\..\VisualStudioOtherLibs\include;C:\progs\GnuWin32\include;d:\progs\OpenAL 1.1 SDK\include;C:\Users\moi\Documents\GitHub\volatile-dove-engine;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;$(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\lua52.lib;pthreadVC2.lib;libxml2.lib;zlib.lib;libiconv.lib;WSock32.Lib;XInput.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\VisualStudioOtherLibs\lib;c:\progs\GnuWin32\lib;D:\progs\OpenAL 1.1 SDK\libs\Win32;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\redistributable_bin\win64;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public\steam\lib\win64;%(AdditionalLibraryDirectories) + + + $(SolutionDir)\.. + $(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso + @@ -245,10 +336,14 @@ Pixel Pixel + Pixel + Pixel Vertex Vertex + Vertex + Vertex diff --git a/Application_EmptyProject/App_VS2008_OpenGL/App_VS2008_OpenGL.sln b/Application_EmptyProject/App_VS2008_OpenGL/App_VS2008_OpenGL.sln index e80f213..63c762f 100644 --- a/Application_EmptyProject/App_VS2008_OpenGL/App_VS2008_OpenGL.sln +++ b/Application_EmptyProject/App_VS2008_OpenGL/App_VS2008_OpenGL.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2008_OpenGL", "App_VS2008_OpenGL.vcproj", "{609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2008_OpenGL", "App_VS2008_OpenGL.vcproj", "{90347322-85ff-4500-95e8-aafdc8cfa1bf}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Debug|Win32.ActiveCfg = Debug|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Debug|Win32.Build.0 = Debug|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Release|Win32.ActiveCfg = Release|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.ActiveCfg = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Build.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.ActiveCfg = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Application_EmptyProject/App_VS2008_SDL/App_VS2008_SDL.sln b/Application_EmptyProject/App_VS2008_SDL/App_VS2008_SDL.sln index 74e110d..9ea5e1f 100644 --- a/Application_EmptyProject/App_VS2008_SDL/App_VS2008_SDL.sln +++ b/Application_EmptyProject/App_VS2008_SDL/App_VS2008_SDL.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2008_SDL", "App_VS2008_SDL.vcproj", "{609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2008_SDL", "App_VS2008_SDL.vcproj", "{90347322-85ff-4500-95e8-aafdc8cfa1bf}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,10 +8,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Debug|Win32.ActiveCfg = Debug|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Debug|Win32.Build.0 = Debug|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Release|Win32.ActiveCfg = Release|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.ActiveCfg = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Build.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.ActiveCfg = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Application_EmptyProject/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln b/Application_EmptyProject/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln index fb201eb..21d26bd 100644 --- a/Application_EmptyProject/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln +++ b/Application_EmptyProject/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln @@ -3,18 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2013 for Windows Desktop VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2013_DX_Desktop", "App_VS2013_DX_Desktop.vcxproj", "{EE29564D-734F-4780-ABE1-6DC11327264F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2013_DX_Desktop", "App_VS2013_DX_Desktop.vcxproj", "{90347322-85ff-4500-95e8-aafdc8cfa1bf}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|Win32.Build.0 = Debug|Win32 - {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|Win32.ActiveCfg = Release|Win32 - {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.ActiveCfg = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Build.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.ActiveCfg = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.Build.0 = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.ActiveCfg = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.ActiveCfg = Release|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Application_EmptyProject/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj b/Application_EmptyProject/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj index 7945a41..61349a8 100644 --- a/Application_EmptyProject/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj +++ b/Application_EmptyProject/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {EE29564D-734F-4780-ABE1-6DC11327264F} @@ -22,6 +30,12 @@ v120 Unicode + + Application + true + v120 + Unicode + Application false @@ -29,21 +43,47 @@ true Unicode + + Application + false + v120 + true + Unicode + + + + + + + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(ProjectName)_$(Platform)_$(Configuration) false + $(ProjectName)_$(Platform)_$(Configuration) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(ProjectName)_$(Platform)_$(Configuration) @@ -67,9 +107,33 @@ ..\WorkDir\shaders\%(Filename).cso - + + + + + + + Level3 + Disabled + USES_WINDOWS8_DESKTOP;CUBEENGINE_DISABLE_OPTIM_MERGE_QUADS;_CRT_SECURE_NO_WARNINGS;USES_STEAM_INTEGRATION;VERSION_X64;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS + true + true + false + C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) + $(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\include;$(SolutionDir)\..\..\VisualStudioOtherLibs\include;C:\progs\GnuWin32\include;d:\progs\OpenAL 1.1 SDK\include;C:\Users\moi\Documents\GitHub\volatile-dove-engine;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public;%(AdditionalIncludeDirectories) + + + Windows + true + d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;$(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\lua52.lib;pthreadVC2.lib;libxml2.lib;zlib.lib;libiconv.lib;WSock32.Lib;XInput.lib;D3DCompiler.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\VisualStudioOtherLibs\lib;c:\progs\GnuWin32\lib;D:\progs\OpenAL 1.1 SDK\libs\Win32;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\redistributable_bin\win64;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public\steam\lib\win64;%(AdditionalLibraryDirectories) + + + $(SolutionDir)\.. + $(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso + @@ -96,9 +160,36 @@ ..\WorkDir\shaders\%(Filename).cso - + + + + + Level3 + + + MaxSpeed + true + true + USES_WINDOWS8_DESKTOP;CUBEENGINE_DISABLE_OPTIM_MERGE_QUADS;_CRT_SECURE_NO_WARNINGS;USES_STEAM_INTEGRATION;VERSION_X64;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS + true + true + C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) + $(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\include;$(SolutionDir)\..\..\VisualStudioOtherLibs\include;C:\progs\GnuWin32\include;d:\progs\OpenAL 1.1 SDK\include;C:\Users\moi\Documents\GitHub\volatile-dove-engine;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;$(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\lua52.lib;pthreadVC2.lib;libxml2.lib;zlib.lib;libiconv.lib;WSock32.Lib;XInput.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\VisualStudioOtherLibs\lib;c:\progs\GnuWin32\lib;D:\progs\OpenAL 1.1 SDK\libs\Win32;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\redistributable_bin\win64;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public\steam\lib\win64;%(AdditionalLibraryDirectories) + + + $(SolutionDir)\.. + $(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso + @@ -226,10 +317,14 @@ Pixel Pixel + Pixel + Pixel Vertex Vertex + Vertex + Vertex diff --git a/Application_EmptyProject/App_VS2013_DX_Store/App_VS2013_DX_Store.sln b/Application_EmptyProject/App_VS2013_DX_Store/App_VS2013_DX_Store.sln index 80c81fd..1616dc4 100644 --- a/Application_EmptyProject/App_VS2013_DX_Store/App_VS2013_DX_Store.sln +++ b/Application_EmptyProject/App_VS2013_DX_Store/App_VS2013_DX_Store.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2013 for Windows VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2013_DX_Store", "App_VS2013_DX_Store.vcxproj", "{90347322-85FF-4500-95E8-AAFDC8CFA1BF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2013_DX_Store", "App_VS2013_DX_Store.vcxproj", "{90347322-85ff-4500-95e8-aafdc8cfa1bf}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,24 +15,24 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|ARM.ActiveCfg = Debug|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|ARM.Build.0 = Debug|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|ARM.Deploy.0 = Debug|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|Win32.ActiveCfg = Debug|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|Win32.Build.0 = Debug|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|Win32.Deploy.0 = Debug|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|x64.ActiveCfg = Debug|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|x64.Build.0 = Debug|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|x64.Deploy.0 = Debug|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|ARM.ActiveCfg = Release|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|ARM.Build.0 = Release|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|ARM.Deploy.0 = Release|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|Win32.ActiveCfg = Release|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|Win32.Build.0 = Release|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|Win32.Deploy.0 = Release|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|x64.ActiveCfg = Release|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|x64.Build.0 = Release|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|x64.Deploy.0 = Release|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|ARM.ActiveCfg = Debug|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|ARM.Build.0 = Debug|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|ARM.Deploy.0 = Debug|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.ActiveCfg = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Build.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Deploy.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.ActiveCfg = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.Build.0 = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.Deploy.0 = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|ARM.ActiveCfg = Release|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|ARM.Build.0 = Release|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|ARM.Deploy.0 = Release|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.ActiveCfg = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Deploy.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.ActiveCfg = Release|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.Build.0 = Release|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.Deploy.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Application_LD34_TwoButtons_Growing/App_VS2008_OpenGL/App_VS2008_OpenGL.sln b/Application_LD34_TwoButtons_Growing/App_VS2008_OpenGL/App_VS2008_OpenGL.sln index e80f213..63c762f 100644 --- a/Application_LD34_TwoButtons_Growing/App_VS2008_OpenGL/App_VS2008_OpenGL.sln +++ b/Application_LD34_TwoButtons_Growing/App_VS2008_OpenGL/App_VS2008_OpenGL.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2008_OpenGL", "App_VS2008_OpenGL.vcproj", "{609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2008_OpenGL", "App_VS2008_OpenGL.vcproj", "{90347322-85ff-4500-95e8-aafdc8cfa1bf}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -9,10 +9,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Debug|Win32.ActiveCfg = Debug|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Debug|Win32.Build.0 = Debug|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Release|Win32.ActiveCfg = Release|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.ActiveCfg = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Build.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.ActiveCfg = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Application_LD34_TwoButtons_Growing/App_VS2008_SDL/App_VS2008_SDL.sln b/Application_LD34_TwoButtons_Growing/App_VS2008_SDL/App_VS2008_SDL.sln index 74e110d..9ea5e1f 100644 --- a/Application_LD34_TwoButtons_Growing/App_VS2008_SDL/App_VS2008_SDL.sln +++ b/Application_LD34_TwoButtons_Growing/App_VS2008_SDL/App_VS2008_SDL.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2008_SDL", "App_VS2008_SDL.vcproj", "{609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2008_SDL", "App_VS2008_SDL.vcproj", "{90347322-85ff-4500-95e8-aafdc8cfa1bf}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -8,10 +8,10 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Debug|Win32.ActiveCfg = Debug|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Debug|Win32.Build.0 = Debug|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Release|Win32.ActiveCfg = Release|Win32 - {609CC8B0-B8BA-4DE1-9EB3-25C4925225E2}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.ActiveCfg = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Build.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.ActiveCfg = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln b/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln index fb201eb..21d26bd 100644 --- a/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln +++ b/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.sln @@ -3,18 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2013 for Windows Desktop VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2013_DX_Desktop", "App_VS2013_DX_Desktop.vcxproj", "{EE29564D-734F-4780-ABE1-6DC11327264F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2013_DX_Desktop", "App_VS2013_DX_Desktop.vcxproj", "{90347322-85ff-4500-95e8-aafdc8cfa1bf}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|Win32.Build.0 = Debug|Win32 - {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|Win32.ActiveCfg = Release|Win32 - {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.ActiveCfg = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Build.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.ActiveCfg = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.Build.0 = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.ActiveCfg = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.ActiveCfg = Release|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj b/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj index aed0f34..779d188 100644 --- a/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj +++ b/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Desktop/App_VS2013_DX_Desktop.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {EE29564D-734F-4780-ABE1-6DC11327264F} @@ -22,6 +30,12 @@ v120 Unicode + + Application + true + v120 + Unicode + Application false @@ -29,21 +43,47 @@ true Unicode + + Application + false + v120 + true + Unicode + + + + + + + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(ProjectName)_$(Platform)_$(Configuration) false + $(ProjectName)_$(Platform)_$(Configuration) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(ProjectName)_$(Platform)_$(Configuration) @@ -67,9 +107,33 @@ ..\WorkDir\shaders\%(Filename).cso - + + + + + + + Level3 + Disabled + USES_WINDOWS8_DESKTOP;CUBEENGINE_DISABLE_OPTIM_MERGE_QUADS;_CRT_SECURE_NO_WARNINGS;USES_STEAM_INTEGRATION;VERSION_X64;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS; + true + true + false + C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) + $(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\include;$(SolutionDir)\..\..\VisualStudioOtherLibs\include;C:\progs\GnuWin32\include;d:\progs\OpenAL 1.1 SDK\include;C:\Users\moi\Documents\GitHub\volatile-dove-engine;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public;%(AdditionalIncludeDirectories) + + + Windows + true + d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;$(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\lua52.lib;pthreadVC2.lib;libxml2.lib;zlib.lib;libiconv.lib;WSock32.Lib;XInput.lib;D3DCompiler.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\VisualStudioOtherLibs\lib;c:\progs\GnuWin32\lib;D:\progs\OpenAL 1.1 SDK\libs\Win32;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\redistributable_bin\win64;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public\steam\lib\win64;%(AdditionalLibraryDirectories) + + + $(SolutionDir)\.. + $(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso + @@ -96,9 +160,36 @@ ..\WorkDir\shaders\%(Filename).cso - + + + + + Level3 + + + MaxSpeed + true + true + USES_WINDOWS8_DESKTOP;CUBEENGINE_DISABLE_OPTIM_MERGE_QUADS;_CRT_SECURE_NO_WARNINGS;USES_STEAM_INTEGRATION;VERSION_X64;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS; + true + true + C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) + $(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\include;$(SolutionDir)\..\..\VisualStudioOtherLibs\include;C:\progs\GnuWin32\include;d:\progs\OpenAL 1.1 SDK\include;C:\Users\moi\Documents\GitHub\volatile-dove-engine;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;$(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\lua52.lib;pthreadVC2.lib;libxml2.lib;zlib.lib;libiconv.lib;WSock32.Lib;XInput.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\VisualStudioOtherLibs\lib;c:\progs\GnuWin32\lib;D:\progs\OpenAL 1.1 SDK\libs\Win32;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\redistributable_bin\win64;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public\steam\lib\win64;%(AdditionalLibraryDirectories) + + + $(SolutionDir)\.. + $(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso + @@ -226,10 +317,14 @@ Pixel Pixel + Pixel + Pixel Vertex Vertex + Vertex + Vertex diff --git a/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Store/App_VS2013_DX_Store.sln b/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Store/App_VS2013_DX_Store.sln index 80c81fd..1616dc4 100644 --- a/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Store/App_VS2013_DX_Store.sln +++ b/Application_LD34_TwoButtons_Growing/App_VS2013_DX_Store/App_VS2013_DX_Store.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Express 2013 for Windows VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2013_DX_Store", "App_VS2013_DX_Store.vcxproj", "{90347322-85FF-4500-95E8-AAFDC8CFA1BF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "App_VS2013_DX_Store", "App_VS2013_DX_Store.vcxproj", "{90347322-85ff-4500-95e8-aafdc8cfa1bf}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,24 +15,24 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|ARM.ActiveCfg = Debug|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|ARM.Build.0 = Debug|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|ARM.Deploy.0 = Debug|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|Win32.ActiveCfg = Debug|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|Win32.Build.0 = Debug|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|Win32.Deploy.0 = Debug|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|x64.ActiveCfg = Debug|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|x64.Build.0 = Debug|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Debug|x64.Deploy.0 = Debug|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|ARM.ActiveCfg = Release|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|ARM.Build.0 = Release|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|ARM.Deploy.0 = Release|ARM - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|Win32.ActiveCfg = Release|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|Win32.Build.0 = Release|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|Win32.Deploy.0 = Release|Win32 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|x64.ActiveCfg = Release|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|x64.Build.0 = Release|x64 - {90347322-85FF-4500-95E8-AAFDC8CFA1BF}.Release|x64.Deploy.0 = Release|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|ARM.ActiveCfg = Debug|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|ARM.Build.0 = Debug|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|ARM.Deploy.0 = Debug|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.ActiveCfg = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Build.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|Win32.Deploy.0 = Debug|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.ActiveCfg = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.Build.0 = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Debug|x64.Deploy.0 = Debug|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|ARM.ActiveCfg = Release|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|ARM.Build.0 = Release|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|ARM.Deploy.0 = Release|ARM + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.ActiveCfg = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Build.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|Win32.Deploy.0 = Release|Win32 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.ActiveCfg = Release|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.Build.0 = Release|x64 + {90347322-85ff-4500-95e8-aafdc8cfa1bf}.Release|x64.Deploy.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/common/Windows/App_VS2013_DX_Desktop.sln b/common/Windows/App_VS2013_DX_Desktop.sln index fb201eb..42f48b0 100644 --- a/common/Windows/App_VS2013_DX_Desktop.sln +++ b/common/Windows/App_VS2013_DX_Desktop.sln @@ -8,13 +8,19 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE29564D-734F-4780-ABE1-6DC11327264F}.Debug|Win32.Build.0 = Debug|Win32 - {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|Win32.ActiveCfg = Release|Win32 - {EE29564D-734F-4780-ABE1-6DC11327264F}.Release|Win32.Build.0 = Release|Win32 + {B6717D50-92FA-4F1F-8D3F-4F8CF7E56A9E}.Debug|Win32.ActiveCfg = Debug|Win32 + {B6717D50-92FA-4F1F-8D3F-4F8CF7E56A9E}.Debug|Win32.Build.0 = Debug|Win32 + {B6717D50-92FA-4F1F-8D3F-4F8CF7E56A9E}.Debug|x64.ActiveCfg = Debug|x64 + {B6717D50-92FA-4F1F-8D3F-4F8CF7E56A9E}.Debug|x64.Build.0 = Debug|x64 + {B6717D50-92FA-4F1F-8D3F-4F8CF7E56A9E}.Release|Win32.ActiveCfg = Release|Win32 + {B6717D50-92FA-4F1F-8D3F-4F8CF7E56A9E}.Release|Win32.Build.0 = Release|Win32 + {B6717D50-92FA-4F1F-8D3F-4F8CF7E56A9E}.Release|x64.ActiveCfg = Release|x64 + {B6717D50-92FA-4F1F-8D3F-4F8CF7E56A9E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/common/Windows/App_VS2013_DX_Desktop.vcxproj.src b/common/Windows/App_VS2013_DX_Desktop.vcxproj.src index fcb55ae..4e32354 100644 --- a/common/Windows/App_VS2013_DX_Desktop.vcxproj.src +++ b/common/Windows/App_VS2013_DX_Desktop.vcxproj.src @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {EE29564D-734F-4780-ABE1-6DC11327264F} @@ -22,6 +30,12 @@ v120 Unicode + + Application + true + v120 + Unicode + Application false @@ -29,21 +43,47 @@ true Unicode + + Application + false + v120 + true + Unicode + + + + + + + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + true + $(ProjectName)_$(Platform)_$(Configuration) false + $(ProjectName)_$(Platform)_$(Configuration) + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + false + $(ProjectName)_$(Platform)_$(Configuration) @@ -67,9 +107,33 @@ ..\WorkDir\shaders\%(Filename).cso - + + + + + + + Level3 + Disabled + USES_WINDOWS8_DESKTOP;CUBEENGINE_DISABLE_OPTIM_MERGE_QUADS;_CRT_SECURE_NO_WARNINGS;USES_STEAM_INTEGRATION;VERSION_X64;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS + true + true + false + C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) + $(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\include;$(SolutionDir)\..\..\VisualStudioOtherLibs\include;C:\progs\GnuWin32\include;d:\progs\OpenAL 1.1 SDK\include;C:\Users\moi\Documents\GitHub\volatile-dove-engine;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public;%(AdditionalIncludeDirectories) + + + Windows + true + d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;$(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\lua52.lib;pthreadVC2.lib;libxml2.lib;zlib.lib;libiconv.lib;WSock32.Lib;XInput.lib;D3DCompiler.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\VisualStudioOtherLibs\lib;c:\progs\GnuWin32\lib;D:\progs\OpenAL 1.1 SDK\libs\Win32;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\redistributable_bin\win64;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public\steam\lib\win64;%(AdditionalLibraryDirectories) + + + $(SolutionDir)\.. + $(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso + @@ -96,9 +160,36 @@ ..\WorkDir\shaders\%(Filename).cso - + + + + + Level3 + + + MaxSpeed + true + true + USES_WINDOWS8_DESKTOP;CUBEENGINE_DISABLE_OPTIM_MERGE_QUADS;_CRT_SECURE_NO_WARNINGS;USES_STEAM_INTEGRATION;VERSION_X64;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS + true + true + C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories) + $(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\include;$(SolutionDir)\..\..\VisualStudioOtherLibs\include;C:\progs\GnuWin32\include;d:\progs\OpenAL 1.1 SDK\include;C:\Users\moi\Documents\GitHub\volatile-dove-engine;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;xaudio2.lib;mfcore.lib;mfplat.lib;mfreadwrite.lib;$(SolutionDir)\..\lua\lua-5.2.3_Win64_vc12_lib\lua52.lib;pthreadVC2.lib;libxml2.lib;zlib.lib;libiconv.lib;WSock32.Lib;XInput.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\VisualStudioOtherLibs\lib;c:\progs\GnuWin32\lib;D:\progs\OpenAL 1.1 SDK\libs\Win32;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\redistributable_bin\win64;d:\Desktop\Steam SDK - Asteroids Minesweeper\Steam SDK - Asteroids Minesweeper\sdk\public\steam\lib\win64;%(AdditionalLibraryDirectories) + + + $(SolutionDir)\.. + $(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso + AUTOMATIC_HIGH_LEVEL_CODE @@ -112,10 +203,14 @@ Pixel Pixel + Pixel + Pixel Vertex Vertex + Vertex + Vertex diff --git a/generate_project.pm b/generate_project.pm index 6c4c03d..232349f 100644 --- a/generate_project.pm +++ b/generate_project.pm @@ -344,7 +344,7 @@ sub processVisualStudioProjectFile_($$$$$$$) $line = "$1$2;".join(';',@l_additional_libs_64).";<\/AdditionalDependencies>$3\n"; } elsif (($arch eq '64') && @l_additional_defines_64 > 0 && $line =~ m/^(.*)([^<]+)<\/PreprocessorDefinitions>(.*)/) - {die; + { $line = "$1$2;".join(';',@l_additional_defines_64).";<\/PreprocessorDefinitions>$3\n"; } elsif (($arch eq 'ARM') && @l_additional_include_dirs_arm > 0 && $line =~ m/^(.*)([^<]+)<\/AdditionalIncludeDirectories>(.*)/)