x64 removal

YasirNacak · Oct 14, 2018 · 2262a35 · 2262a35
1 parent b724be6
commit 2262a35
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 99 deletions.
diff --git a/dx11engine.sln b/dx11engine.sln
@@ -7,18 +7,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dx11engine", "project\dx11e
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{40D7512A-E5B8-46B9-A749-3D04939CD690}.Debug|x64.ActiveCfg = Debug|x64
-		{40D7512A-E5B8-46B9-A749-3D04939CD690}.Debug|x64.Build.0 = Debug|x64
 		{40D7512A-E5B8-46B9-A749-3D04939CD690}.Debug|x86.ActiveCfg = Debug|Win32
 		{40D7512A-E5B8-46B9-A749-3D04939CD690}.Debug|x86.Build.0 = Debug|Win32
-		{40D7512A-E5B8-46B9-A749-3D04939CD690}.Release|x64.ActiveCfg = Release|x64
-		{40D7512A-E5B8-46B9-A749-3D04939CD690}.Release|x64.Build.0 = Release|x64
 		{40D7512A-E5B8-46B9-A749-3D04939CD690}.Release|x86.ActiveCfg = Release|Win32
 		{40D7512A-E5B8-46B9-A749-3D04939CD690}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection

diff --git a/...al/directxtk/libs/x86/Debug/DirectXTK.lib → external/directxtk/libs/Debug/DirectXTK.lib b/...al/directxtk/libs/x86/Debug/DirectXTK.lib → external/directxtk/libs/Debug/DirectXTK.lib
diff --git a/.../directxtk/libs/x86/Release/DirectXTK.lib → ...rnal/directxtk/libs/Release/DirectXTK.lib b/.../directxtk/libs/x86/Release/DirectXTK.lib → ...rnal/directxtk/libs/Release/DirectXTK.lib
diff --git a/external/directxtk/libs/x64/Debug/DirectXTK.lib b/external/directxtk/libs/x64/Debug/DirectXTK.lib
diff --git a/external/directxtk/libs/x64/Release/DirectXTK.lib b/external/directxtk/libs/x64/Release/DirectXTK.lib
diff --git a/external/fmod/libs/x86/Debug/fmodL_vc.lib → external/fmod/libs/Debug/fmodL_vc.lib b/external/fmod/libs/x86/Debug/fmodL_vc.lib → external/fmod/libs/Debug/fmodL_vc.lib
diff --git a/external/fmod/libs/x86/Release/fmod_vc.lib → external/fmod/libs/Release/fmod_vc.lib b/external/fmod/libs/x86/Release/fmod_vc.lib → external/fmod/libs/Release/fmod_vc.lib
diff --git a/external/fmod/libs/libfmod.a b/external/fmod/libs/libfmod.a
diff --git a/external/fmod/libs/libfmodL.a b/external/fmod/libs/libfmodL.a
diff --git a/external/fmod/libs/x64/Debug/fmodL64_vc.lib b/external/fmod/libs/x64/Debug/fmodL64_vc.lib
diff --git a/external/fmod/libs/x64/Release/fmod64_vc.lib b/external/fmod/libs/x64/Release/fmod64_vc.lib
diff --git a/fmod64.dll b/fmod64.dll
diff --git a/fmodL64.dll b/fmodL64.dll
diff --git a/project/dx11engine.vcxproj b/project/dx11engine.vcxproj
@@ -9,14 +9,6 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
@@ -40,19 +32,6 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -64,38 +43,18 @@
   <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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <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|x64'">
-    <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>
     <IncludePath>$(SolutionDir)external\fmod\includes;$(SolutionDir)external\directxtk\includes;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)external\fmod\libs\x86\Debug;$(SolutionDir)external\directxtk\libs\x86\Debug;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)\bin\build\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)external\fmod\includes;$(SolutionDir)external\directxtk\includes;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)external\fmod\libs\x64\Debug;$(SolutionDir)external\directxtk\libs\x64\Debug;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)\bin\build\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
+    <LibraryPath>$(SolutionDir)external\fmod\libs\Debug;$(SolutionDir)external\directxtk\libs\Debug;$(LibraryPath)</LibraryPath>
+    <OutDir>$(SolutionDir)\bin\build\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\bin\intermediate\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(SolutionDir)external\fmod\includes;$(SolutionDir)external\directxtk\includes;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)external\fmod\libs\x86\Release;$(SolutionDir)external\directxtk\libs\x86\Release;$(LibraryPath)</LibraryPath>
-    <OutDir>$(SolutionDir)\bin\build\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)external\fmod\includes;$(SolutionDir)external\directxtk\includes;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)external\fmod\libs\x64\Release;$(SolutionDir)external\directxtk\libs\x64\Release;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)external\fmod\libs\Release;$(SolutionDir)external\directxtk\libs\Release;$(LibraryPath)</LibraryPath>
     <OutDir>$(SolutionDir)\bin\build\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -115,22 +74,6 @@
       <ObjectFileOutput>$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
     </FxCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>fmodL64_vc.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <FxCompile>
-      <ObjectFileOutput>$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
-    </FxCompile>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -151,26 +94,6 @@
       <ObjectFileOutput>$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
     </FxCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <AdditionalDependencies>fmod64_vc.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <FxCompile>
-      <ObjectFileOutput>$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
-    </FxCompile>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\external\imgui\imgui.cpp" />
     <ClCompile Include="..\external\imgui\imgui_demo.cpp" />
@@ -229,28 +152,16 @@
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
-      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
-      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
       <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
       <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
-      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
-      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
     </FxCompile>
     <FxCompile Include="..\data\shader\vertexshader.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">5.0</ShaderModel>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">5.0</ShaderModel>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
-      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">5.0</ShaderModel>
-      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
-      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">5.0</ShaderModel>
       <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
       <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
-      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
-      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)data\shader\%(Filename).cso</ObjectFileOutput>
     </FxCompile>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/graphics/Graphics.cpp b/src/graphics/Graphics.cpp
@@ -334,7 +334,9 @@ namespace s3d { namespace graphics {
 			_fpsTimer.Restart();
 		}
 		_spriteBatch->Begin();
+#if _DEBUG
 		_spriteFont->DrawString(_spriteBatch.get(), utility::StringConverter::StringToWide(fpsString).c_str(), DirectX::XMFLOAT2(_windowWidth - 100, 0), DirectX::Colors::Lime, 0.0f, DirectX::XMFLOAT2(0.0f, 0.0f), DirectX::XMFLOAT2(1.0f, 1.0f));
+#endif
 		_spriteBatch->End();
 
 #if _DEBUG