commit 7858fd8253299d4121a95073e44367717b431d3e
parent 9cd00ce46f86072b7cfc0cf05b191f4fb224d6a9
Author: Brian Swetland <swetland@frotz.net>
Date: Wed, 3 Jul 2013 03:38:49 -0700
windows: build: remove some dx cruft, further tidy things
Diffstat:
3 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/common/common.vcxproj b/common/common.vcxproj
@@ -39,12 +39,12 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>$(DXSDK_DIR)Include;..\zlib-1.2.7;..\libpng-1.2.50;$(IncludePath)</IncludePath>
+ <IncludePath>..\zlib-1.2.7;..\libpng-1.2.50;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)_$(Configuration)\</OutDir>
<IntDir>_$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>$(DXSDK_LIB)Include;..\zlib-1.2.7;..\libpng-1.2.50;$(IncludePath)</IncludePath>
+ <IncludePath>..\zlib-1.2.7;..\libpng-1.2.50;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)_$(Configuration)\</OutDir>
<IntDir>_$(Configuration)\</IntDir>
</PropertyGroup>
@@ -103,4 +103,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/hello/hello.vcxproj b/hello/hello.vcxproj
@@ -39,17 +39,13 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
- <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
- <LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
- <OutDir>$(SolutionDir)_$(Configuration)\</OutDir>
+ <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(IncludePath)</IncludePath>
+ <OutDir>$(SolutionDir)_$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>_$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
- <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
- <LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
- <OutDir>$(SolutionDir)_$(Configuration)\</OutDir>
+ <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(IncludePath)</IncludePath>
+ <OutDir>$(SolutionDir)_$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>_$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -64,7 +60,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>common.lib;SDL2.lib;SDL2main.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;$(OutDir)..\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>XCOPY "$(ProjectDir)..\..\SDL-2.0.0\lib\x86\SDL2.dll" "$(TargetDir)" /E /I /F /Y
@@ -86,7 +82,7 @@ XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>common.lib;SDL2.lib;SDL2main.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;$(OutDir)..\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
diff --git a/test/test.vcxproj b/test/test.vcxproj
@@ -42,17 +42,13 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
- <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
- <LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
- <OutDir>$(SolutionDir)_$(Configuration)\</OutDir>
+ <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(IncludePath)</IncludePath>
+ <OutDir>$(SolutionDir)_$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>_$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ExecutablePath>$(DXSDK_DIR)Utilities\bin\x86;$(ExecutablePath)</ExecutablePath>
- <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
- <LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
- <OutDir>$(SolutionDir)_$(Configuration)\</OutDir>
+ <IncludePath>..\libpng-1.2.50;..\zlib-1.2.7;$(IncludePath)</IncludePath>
+ <OutDir>$(SolutionDir)_$(Configuration)\$(ProjectName)\</OutDir>
<IntDir>_$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -67,7 +63,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>common.lib;SDL2.lib;SDL2main.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;$(OutDir)..\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>XCOPY "$(ProjectDir)..\..\SDL-2.0.0\lib\x86\SDL2.dll" "$(TargetDir)" /E /I /F /Y
@@ -89,7 +85,7 @@ XCOPY "$(ProjectDir)assets" "$(TargetDir)assets" /E /I /F /Y</Command>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>common.lib;SDL2.lib;SDL2main.lib;libpng-1.2.50.lib;zlib-1.2.7.lib;OpenGL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
- <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\SDL-2.0.0\lib\x86;$(OutDir)..\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
