Skip to content

Commit 4419a1b

Browse files
HeliumAntHeliumAnt
committed
build sdl_image
1 parent 27c3d09 commit 4419a1b

14 files changed

+308
-45
lines changed

‎RTEA.vcxproj

Lines changed: 275 additions & 24 deletions
Large diffs are not rendered by default.

‎RTEA.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,9 @@
656656
<ClInclude Include="Source\Renderer\raylib\rlutil.h">
657657
<Filter>Renderer\raylib</Filter>
658658
</ClInclude>
659+
<ClInclude Include="Source\Renderer\raylib\rlutils.h">
660+
<Filter>Renderer\raylib</Filter>
661+
</ClInclude>
659662
</ItemGroup>
660663
<ItemGroup>
661664
<ClCompile Include="Source\System\Box.cpp">

‎Source/Main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
/// </summary>
2020

2121
#include "allegro.h"
22-
#include "SDL2/SDL.h"
23-
#include "SDL2/SDL_image.h"
22+
#include "SDL.h"
23+
#include "SDL_image.h"
2424

2525
#include "GUI.h"
2626
#include "GUIInputWrapper.h"

‎Source/Managers/FrameMan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "tracy/Tracy.hpp"
3030
#include "tracy/TracyOpenGL.hpp"
31-
#include "SDL2/SDL_image.h"
31+
#include "SDL_image.h"
3232

3333
using namespace RTE;
3434

‎Source/System/ContentFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "png.h"
1111
#include "fmod/fmod.hpp"
1212
#include "fmod/fmod_errors.h"
13-
#include "SDL2/SDL_image.h"
13+
#include "SDL_image.h"
1414

1515
#include <cstring>
1616

‎external/sources/SDL2_image-2.8.2/VisualC/SDL_image.vcxproj

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,24 @@
2222
<ProjectName>SDL2_image</ProjectName>
2323
<ProjectGuid>{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}</ProjectGuid>
2424
<RootNamespace>SDL2_image</RootNamespace>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
28-
<ConfigurationType>DynamicLibrary</ConfigurationType>
29+
<ConfigurationType>StaticLibrary</ConfigurationType>
30+
<PlatformToolset>v143</PlatformToolset>
2931
</PropertyGroup>
3032
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
31-
<ConfigurationType>DynamicLibrary</ConfigurationType>
33+
<ConfigurationType>StaticLibrary</ConfigurationType>
34+
<PlatformToolset>v143</PlatformToolset>
3235
</PropertyGroup>
3336
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
34-
<ConfigurationType>DynamicLibrary</ConfigurationType>
37+
<ConfigurationType>StaticLibrary</ConfigurationType>
38+
<PlatformToolset>v143</PlatformToolset>
3539
</PropertyGroup>
3640
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
37-
<ConfigurationType>DynamicLibrary</ConfigurationType>
41+
<ConfigurationType>StaticLibrary</ConfigurationType>
42+
<PlatformToolset>v143</PlatformToolset>
3843
</PropertyGroup>
3944
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4045
<ImportGroup Label="ExtensionSettings">
@@ -58,13 +63,13 @@
5863
<PropertyGroup Label="UserMacros" />
5964
<PropertyGroup>
6065
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
61-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
66+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\_Bin</OutDir>
6267
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
63-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
68+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\_Bin</OutDir>
6469
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
65-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
70+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\_Bin</OutDir>
6671
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
67-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
72+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\_Bin</OutDir>
6873
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
6974
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
7075
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -80,20 +85,24 @@
8085
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
8186
</PropertyGroup>
8287
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
83-
<IncludePath>$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
88+
<IncludePath>$(SolutionDir)..\..\SDL2-2.26.3\include;$(IncludePath)</IncludePath>
8489
<LibraryPath>$(SolutionDir)..\..\SDL\VisualC\$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
90+
<TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
8591
</PropertyGroup>
8692
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
87-
<IncludePath>$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
93+
<IncludePath>$(SolutionDir)..\..\SDL2-2.26.3\include;$(IncludePath)</IncludePath>
8894
<LibraryPath>$(SolutionDir)..\..\SDL\VisualC\$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
95+
<TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
8996
</PropertyGroup>
9097
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
91-
<IncludePath>$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
98+
<IncludePath>$(SolutionDir)..\..\SDL2-2.26.3\include;$(IncludePath)</IncludePath>
9299
<LibraryPath>$(SolutionDir)..\..\SDL\VisualC\$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
100+
<TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
93101
</PropertyGroup>
94102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
95-
<IncludePath>$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
103+
<IncludePath>$(SolutionDir)..\..\SDL2-2.26.3\include;$(IncludePath)</IncludePath>
96104
<LibraryPath>$(SolutionDir)..\..\SDL\VisualC\$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
105+
<TargetName>$(ProjectName)-$(Configuration)-$(Platform)</TargetName>
97106
</PropertyGroup>
98107
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
99108
<Midl>
@@ -107,7 +116,7 @@
107116
</Midl>
108117
<ClCompile>
109118
<Optimization>Disabled</Optimization>
110-
<AdditionalIncludeDirectories>$(ProjectDir)\..\include;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119+
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\SDL2-2.26.3\include;$(ProjectDir)\..\include;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
111120
<PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;USE_STBIMAGE;LOAD_AVIF;LOAD_AVIF_DYNAMIC="libavif-16.dll";LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNM;LOAD_QOI;LOAD_SVG;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-7.dll";LOAD_WEBPDEMUX_DYNAMIC="libwebpdemux-2.dll";LOAD_XCF;LOAD_XPM;LOAD_XV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112121
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
113122
<WarningLevel>Level3</WarningLevel>
@@ -135,7 +144,7 @@
135144
</HeaderFileName>
136145
</Midl>
137146
<ClCompile>
138-
<AdditionalIncludeDirectories>$(ProjectDir)\..\include;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147+
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\SDL2-2.26.3\include;$(ProjectDir)\..\include;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
139148
<PreprocessorDefinitions>DLL_EXPORT;_DEBUG;WIN32;_WINDOWS;USE_STBIMAGE;LOAD_AVIF;LOAD_AVIF_DYNAMIC="libavif-16.dll";LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNM;LOAD_QOI;LOAD_SVG;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-7.dll";LOAD_WEBPDEMUX_DYNAMIC="libwebpdemux-2.dll";LOAD_XCF;LOAD_XPM;LOAD_XV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
140149
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
141150
<WarningLevel>Level3</WarningLevel>
@@ -164,7 +173,7 @@
164173
</HeaderFileName>
165174
</Midl>
166175
<ClCompile>
167-
<AdditionalIncludeDirectories>$(ProjectDir)\..\include;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
176+
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\SDL2-2.26.3\include;$(ProjectDir)\..\include;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
168177
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;USE_STBIMAGE;LOAD_AVIF;LOAD_AVIF_DYNAMIC="libavif-16.dll";LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNM;LOAD_QOI;LOAD_SVG;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-7.dll";LOAD_WEBPDEMUX_DYNAMIC="libwebpdemux-2.dll";LOAD_XCF;LOAD_XPM;LOAD_XV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169178
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
170179
<WarningLevel>Level3</WarningLevel>
@@ -190,7 +199,7 @@
190199
</HeaderFileName>
191200
</Midl>
192201
<ClCompile>
193-
<AdditionalIncludeDirectories>$(ProjectDir)\..\include;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
202+
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\SDL2-2.26.3\include;$(ProjectDir)\..\include;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
194203
<PreprocessorDefinitions>DLL_EXPORT;NDEBUG;WIN32;_WINDOWS;USE_STBIMAGE;LOAD_AVIF;LOAD_AVIF_DYNAMIC="libavif-16.dll";LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNM;LOAD_QOI;LOAD_SVG;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-7.dll";LOAD_WEBPDEMUX_DYNAMIC="libwebpdemux-2.dll";LOAD_XCF;LOAD_XPM;LOAD_XV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195204
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
196205
<WarningLevel>Level3</WarningLevel>
@@ -236,4 +245,4 @@
236245
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
237246
<ImportGroup Label="ExtensionTargets">
238247
</ImportGroup>
239-
</Project>
248+
</Project>

‎external/sources/SDL2_image-2.8.2/_Bin/SDL2_image-Debug-.lib

1.45 MB
Binary file not shown.

‎external/sources/SDL2_image-2.8.2/_Bin/SDL2_image-Debug-Win32.lib

1.38 MB
Binary file not shown.

‎external/sources/SDL2_image-2.8.2/_Bin/SDL2_image-Debug-x64.lib

1.45 MB
Binary file not shown.

‎external/sources/SDL2_image-2.8.2/_Bin/SDL2_image-Debug.lib

1.45 MB
Binary file not shown.

0 commit comments

Comments
 (0)