generate_project: Added support for x64 in VS2013_DX_desktop

phrounz · Aug 24, 2016 · ab3ccdf · ab3ccdf
1 parent 64a1328
commit ab3ccdf
Show file tree

Hide file tree

Showing 15 changed files with 493 additions and 89 deletions.
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
@@ -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
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{EE29564D-734F-4780-ABE1-6DC11327264F}</ProjectGuid>
@@ -22,28 +30,60 @@
     <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)_$(Platform)_$(Configuration)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)_$(Platform)_$(Configuration)</TargetName>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)_$(Platform)_$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -67,9 +107,33 @@
     <FxCompile>
       <ObjectFileOutput>..\WorkDir\shaders\%(Filename).cso</ObjectFileOutput>
     </FxCompile>
-    <PostBuildEvent>
+    <!--<PostBuildEvent>
       <Command>copy $(SolutionDir)\..\..\common\dependancy_libraries\dll\*.dll $(SolutionDir)\..\WorkDir\</Command>
-    </PostBuildEvent>
+    </PostBuildEvent>-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>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</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <MinimalRebuild>false</MinimalRebuild>
+      <AdditionalUsingDirectories>C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>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)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(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)</AdditionalLibraryDirectories>
+    </Link>
+    <FxCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..</AdditionalIncludeDirectories>
+      <ObjectFileOutput>$(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -96,9 +160,36 @@
     <FxCompile>
       <ObjectFileOutput>..\WorkDir\shaders\%(Filename).cso</ObjectFileOutput>
     </FxCompile>
-    <PostBuildEvent>
+    <!--<PostBuildEvent>
       <Command>copy $(SolutionDir)\..\..\common\dependancy_libraries\dll\*.dll $(SolutionDir)\..\WorkDir\</Command>
-    </PostBuildEvent>
+    </PostBuildEvent>-->
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>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</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <AdditionalUsingDirectories>C:\progs\Microsoft Visual Studio 12.0\VC\vcpackages;C:\Program Files %28x86%29\Windows Kits\8.1\References\CommonConfiguration\Neutral;%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>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)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(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)</AdditionalLibraryDirectories>
+    </Link>
+    <FxCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..</AdditionalIncludeDirectories>
+      <ObjectFileOutput>$(LocalDebuggerWorkingDirectory)\shaders\%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
 <ClCompile Include="..\..\Application_AnUnconventionalWeapon\code\Burning.cpp" />
@@ -245,10 +336,14 @@
     <FxCompile Include="..\..\shaders\SimplePixelShader.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
+	  <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
     </FxCompile>
     <FxCompile Include="..\..\shaders\SimpleVertexShader.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
+	  <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
     </FxCompile>
   </ItemGroup>
   <ItemGroup>

diff --git a/Application_EmptyProject/App_VS2008_OpenGL/App_VS2008_OpenGL.sln b/Application_EmptyProject/App_VS2008_OpenGL/App_VS2008_OpenGL.sln
@@ -1,18 +1,18 @@
 
 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
 		Debug|Win32 = Debug|Win32
 		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
@@ -1,17 +1,17 @@
 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
 		Debug|Win32 = Debug|Win32
 		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
@@ -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