We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch for proposed fix - use $(ProjectDir), rather than $(SolutionDir), to find SDL headers

SDL_bugfix_for_3114.patch (text/plain), 7.96 KB, created by David Ludwig on 2015-09-07 17:28:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Ludwig

Created: 2015-09-07 17:28:54 UTC

Size: 7.96 KB

patch

obsolete

># HG changeset patch
># User David Ludwig <dludwig@pobox.com>
># Date 1441646736 14400
>#      Mon Sep 07 13:25:36 2015 -0400
># Node ID 2ec928ff921c2fc26a132403bff58ad74444ef74
># Parent  6d6a972746b39e1e36bbfe80266ab111dc623fe8
>Fix Bug 3114: SDL's MSVC-2010+ projects can fail to build via a custom VS .sln
>
>diff -r 6d6a972746b3 -r 2ec928ff921c VisualC/SDL/SDL.vcxproj
>--- a/VisualC/SDL/SDL.vcxproj	Sat Sep 05 20:21:52 2015 +0200
>+++ b/VisualC/SDL/SDL.vcxproj	Mon Sep 07 13:25:36 2015 -0400
>@@ -93,7 +93,7 @@
>     </Midl>
>     <ClCompile>
>       <Optimization>Disabled</Optimization>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>@@ -124,7 +124,7 @@
>     </Midl>
>     <ClCompile>
>       <Optimization>Disabled</Optimization>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>@@ -158,7 +158,7 @@
>       <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
>     </Midl>
>     <ClCompile>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>@@ -190,7 +190,7 @@
>       <TypeLibraryName>.\Release/SDL.tlb</TypeLibraryName>
>     </Midl>
>     <ClCompile>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>diff -r 6d6a972746b3 -r 2ec928ff921c VisualC/SDLmain/SDLmain.vcxproj
>--- a/VisualC/SDLmain/SDLmain.vcxproj	Sat Sep 05 20:21:52 2015 +0200
>+++ b/VisualC/SDLmain/SDLmain.vcxproj	Mon Sep 07 13:25:36 2015 -0400
>@@ -85,7 +85,7 @@
>       </Command>
>     </PreBuildEvent>
>     <ClCompile>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <StringPooling>true</StringPooling>
>@@ -102,7 +102,7 @@
>       <TargetEnvironment>X64</TargetEnvironment>
>     </Midl>
>     <ClCompile>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <StringPooling>true</StringPooling>
>@@ -121,7 +121,7 @@
>     </PreBuildEvent>
>     <ClCompile>
>       <Optimization>Disabled</Optimization>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>@@ -138,7 +138,7 @@
>     </Midl>
>     <ClCompile>
>       <Optimization>Disabled</Optimization>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>diff -r 6d6a972746b3 -r 2ec928ff921c VisualC/SDLtest/SDLtest.vcxproj
>--- a/VisualC/SDLtest/SDLtest.vcxproj	Sat Sep 05 20:21:52 2015 +0200
>+++ b/VisualC/SDLtest/SDLtest.vcxproj	Mon Sep 07 13:25:36 2015 -0400
>@@ -85,7 +85,7 @@
>       </Command>
>     </PreBuildEvent>
>     <ClCompile>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <StringPooling>true</StringPooling>
>@@ -102,7 +102,7 @@
>       <TargetEnvironment>X64</TargetEnvironment>
>     </Midl>
>     <ClCompile>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <StringPooling>true</StringPooling>
>@@ -121,7 +121,7 @@
>     </PreBuildEvent>
>     <ClCompile>
>       <Optimization>Disabled</Optimization>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>@@ -138,7 +138,7 @@
>     </Midl>
>     <ClCompile>
>       <Optimization>Disabled</Optimization>
>-      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>+      <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

Actions: View | Diff

Attachments on bug 3114: 2260

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.