From 6f8b236cfb90ac1b6772b3ad2424ace42ea474ce Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sat, 14 Dec 2024 02:42:03 +0100
Subject: [PATCH] showimage: make showimage compatible with recent MSBuild
---
VisualC/SDL_image.sln | 2 --
VisualC/showimage/showimage.vcxproj | 53 +++++++----------------------
2 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/VisualC/SDL_image.sln b/VisualC/SDL_image.sln
index ba40ec77..f2de9575 100644
--- a/VisualC/SDL_image.sln
+++ b/VisualC/SDL_image.sln
@@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_image", "SDL_image.vcx
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "showimage", "showimage\showimage.vcxproj", "{FEE80C5D-762E-4E57-9BCB-928749E8203F}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3", "..\external\SDL\VisualC\SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
diff --git a/VisualC/showimage/showimage.vcxproj b/VisualC/showimage/showimage.vcxproj
index 1031c9fd..895c8468 100644
--- a/VisualC/showimage/showimage.vcxproj
+++ b/VisualC/showimage/showimage.vcxproj
@@ -43,22 +43,6 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
- </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
@@ -85,20 +69,20 @@
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>$(SolutionDir)..\include;$(SolutionDir)..\external\SDL\include;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
+ <IncludePath>$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\SDL\include;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(PlatformName)\$(Configuration);$(ProjectDir)..\..\..\SDL\VisualC\$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>$(SolutionDir)..\include;$(SolutionDir)..\external\SDL\include;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
+ <IncludePath>$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\SDL\include;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(PlatformName)\$(Configuration);$(ProjectDir)..\..\..\SDL\VisualC\$(PlatformName)\$(Configuration);;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IncludePath>$(SolutionDir)..\include;$(SolutionDir)..\external\SDL\include;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
+ <IncludePath>$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\SDL\include;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(PlatformName)\$(Configuration);$(ProjectDir)..\..\..\SDL\VisualC\$(PlatformName)\$(Configuration);;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IncludePath>$(SolutionDir)..\include;$(SolutionDir)..\external\SDL\include;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
+ <IncludePath>$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\SDL\include;$(IncludePath)</IncludePath>
+ <LibraryPath>$(SolutionDir)$(PlatformName)\$(Configuration);$(ProjectDir)..\..\..\SDL\VisualC\$(PlatformName)\$(Configuration);;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
@@ -106,7 +90,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Debug/showimage.tlb</TypeLibraryName>
+ <TypeLibraryName>.\$(Configuration)\showimage.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -126,7 +110,6 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
- <Bscmake />
<PostBuildEvent>
<Command>
</Command>
@@ -140,7 +123,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>.\Debug/showimage.tlb</TypeLibraryName>
+ <TypeLibraryName>.\$(Configuration)\showimage.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -160,7 +143,6 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
- <Bscmake />
<PostBuildEvent>
<Command>
</Command>
@@ -174,7 +156,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Release/showimage.tlb</TypeLibraryName>
+ <TypeLibraryName>.\$(Configuration)\showimage.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -186,7 +168,7 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>.\Release/showimage.pch</PrecompiledHeaderOutputFile>
+ <PrecompiledHeaderOutputFile>.\$(Configuration)\showimage.pch</PrecompiledHeaderOutputFile>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs>
@@ -197,13 +179,8 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <ProgramDatabaseFile>.\Release/showimage.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
</Link>
- <Bscmake>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <OutputFile>.\Release/showimage.bsc</OutputFile>
- </Bscmake>
<PostBuildEvent>
<Command>
</Command>
@@ -217,7 +194,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>.\Release/showimage.tlb</TypeLibraryName>
+ <TypeLibraryName>.\$(Configuration)\showimage.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -234,7 +211,6 @@
<AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
- <Bscmake />
<PostBuildEvent>
<Command>
</Command>
@@ -243,9 +219,6 @@
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ProjectReference Include="..\..\external\SDL\VisualC\SDL\SDL.vcxproj">
- <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
- </ProjectReference>
<ProjectReference Include="..\SDL_image.vcxproj">
<Project>{2bd5534e-00e2-4bea-ac96-d9a92ea24696}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>