Fix Bug 3114: SDL's MSVC-2010+ projects can fail to build via a custom VS .sln
authorDavid Ludwig <dludwig@pobox.com>
Mon, 07 Sep 2015 13:25:36 -0400
changeset 98592ec928ff921c
parent 9858 6d6a972746b3
child 9860 858a9b80e18a
Fix Bug 3114: SDL's MSVC-2010+ projects can fail to build via a custom VS .sln
VisualC/SDL/SDL.vcxproj
VisualC/SDLmain/SDLmain.vcxproj
VisualC/SDLtest/SDLtest.vcxproj
     1.1 --- a/VisualC/SDL/SDL.vcxproj	Sat Sep 05 20:21:52 2015 +0200
     1.2 +++ b/VisualC/SDL/SDL.vcxproj	Mon Sep 07 13:25:36 2015 -0400
     1.3 @@ -93,7 +93,7 @@
     1.4      </Midl>
     1.5      <ClCompile>
     1.6        <Optimization>Disabled</Optimization>
     1.7 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     1.8 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     1.9        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    1.10        <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.11        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    1.12 @@ -124,7 +124,7 @@
    1.13      </Midl>
    1.14      <ClCompile>
    1.15        <Optimization>Disabled</Optimization>
    1.16 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.17 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.18        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    1.19        <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.20        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    1.21 @@ -158,7 +158,7 @@
    1.22        <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
    1.23      </Midl>
    1.24      <ClCompile>
    1.25 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.26 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.27        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    1.28        <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.29        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    1.30 @@ -190,7 +190,7 @@
    1.31        <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
    1.32      </Midl>
    1.33      <ClCompile>
    1.34 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.35 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    1.36        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    1.37        <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    1.38        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     2.1 --- a/VisualC/SDLmain/SDLmain.vcxproj	Sat Sep 05 20:21:52 2015 +0200
     2.2 +++ b/VisualC/SDLmain/SDLmain.vcxproj	Mon Sep 07 13:25:36 2015 -0400
     2.3 @@ -85,7 +85,7 @@
     2.4        </Command>
     2.5      </PreBuildEvent>
     2.6      <ClCompile>
     2.7 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     2.8 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     2.9        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    2.10        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.11        <StringPooling>true</StringPooling>
    2.12 @@ -102,7 +102,7 @@
    2.13        <TargetEnvironment>X64</TargetEnvironment>
    2.14      </Midl>
    2.15      <ClCompile>
    2.16 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.17 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.18        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    2.19        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.20        <StringPooling>true</StringPooling>
    2.21 @@ -121,7 +121,7 @@
    2.22      </PreBuildEvent>
    2.23      <ClCompile>
    2.24        <Optimization>Disabled</Optimization>
    2.25 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.26 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.27        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    2.28        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.29        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    2.30 @@ -138,7 +138,7 @@
    2.31      </Midl>
    2.32      <ClCompile>
    2.33        <Optimization>Disabled</Optimization>
    2.34 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.35 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    2.36        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    2.37        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    2.38        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     3.1 --- a/VisualC/SDLtest/SDLtest.vcxproj	Sat Sep 05 20:21:52 2015 +0200
     3.2 +++ b/VisualC/SDLtest/SDLtest.vcxproj	Mon Sep 07 13:25:36 2015 -0400
     3.3 @@ -85,7 +85,7 @@
     3.4        </Command>
     3.5      </PreBuildEvent>
     3.6      <ClCompile>
     3.7 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     3.8 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     3.9        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    3.10        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3.11        <StringPooling>true</StringPooling>
    3.12 @@ -102,7 +102,7 @@
    3.13        <TargetEnvironment>X64</TargetEnvironment>
    3.14      </Midl>
    3.15      <ClCompile>
    3.16 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.17 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.18        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    3.19        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3.20        <StringPooling>true</StringPooling>
    3.21 @@ -121,7 +121,7 @@
    3.22      </PreBuildEvent>
    3.23      <ClCompile>
    3.24        <Optimization>Disabled</Optimization>
    3.25 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.26 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.27        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    3.28        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3.29        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    3.30 @@ -138,7 +138,7 @@
    3.31      </Midl>
    3.32      <ClCompile>
    3.33        <Optimization>Disabled</Optimization>
    3.34 -      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.35 +      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    3.36        <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
    3.37        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    3.38        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>