From 3d9b76bb4569758ffa7f2629d1473bc22afa1280 Mon Sep 17 00:00:00 2001 From: "Rob Swindell (on Windows 11)" <rob@synchro.net> Date: Thu, 28 Sep 2023 00:29:53 -0700 Subject: [PATCH] Fix include and library path locations for when the project file is not in src/* e.g. src/sbbs3/scfg/scfg.vcxproj --- src/build/sdl.props | 4 ++-- src/build/sdl2.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/build/sdl.props b/src/build/sdl.props index 871e0ce9af..009a5177cb 100644 --- a/src/build/sdl.props +++ b/src/build/sdl.props @@ -6,10 +6,10 @@ <ItemDefinitionGroup> <ClCompile> <PreprocessorDefinitions>WITH_SDL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\3rdp\win32.release\sdl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\3rdp\win32.release\sdl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalLibraryDirectories>..\..\3rdp\win32.release\sdl\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\3rdp\win32.release\sdl\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> <Link> <AdditionalDependencies>SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/src/build/sdl2.props b/src/build/sdl2.props index 7c76a0818d..4e4afc5d5a 100644 --- a/src/build/sdl2.props +++ b/src/build/sdl2.props @@ -6,10 +6,10 @@ <ItemDefinitionGroup> <ClCompile> <PreprocessorDefinitions>WITH_SDL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>..\..\3rdp\win32.release\sdl2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\3rdp\win32.release\sdl2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> - <AdditionalLibraryDirectories>..\..\3rdp\win32.release\sdl2\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)..\..\3rdp\win32.release\sdl2\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> <Link> <AdditionalDependencies>SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies> -- GitLab