From 92461e9b1ee2c4efdad6153bc861f169115613ce Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 5 Jan 2023 15:01:20 -0800
Subject: [PATCH] Updated Visual Studio and Xcode projects for SDL 3.0
---
VisualC-WinRT/SDL_ttf-UWP.sln | 2 +-
VisualC-WinRT/SDL_ttf-UWP.vcxproj | 18 ++---
VisualC/SDL_ttf.sln | 2 +-
VisualC/SDL_ttf.vcxproj | 26 +++----
VisualC/glfont/glfont.vcxproj | 10 +--
.../cmake/sdl2_ttf-config-version.cmake | 10 +--
.../pkg-support/cmake/sdl2_ttf-config.cmake | 46 +++++------
VisualC/showfont/showfont.vcxproj | 10 +--
Xcode/SDL_ttf.xcodeproj/project.pbxproj | 44 +++++------
.../CMake/sdl2_ttf-config-version.cmake | 6 +-
.../resources/CMake/sdl2_ttf-config.cmake | 40 +++++-----
Xcode/pkg-support/resources/ReadMe.txt | 6 +-
.../showfont.xcodeproj/project.pbxproj | 76 +++++++++----------
13 files changed, 148 insertions(+), 148 deletions(-)
diff --git a/VisualC-WinRT/SDL_ttf-UWP.sln b/VisualC-WinRT/SDL_ttf-UWP.sln
index 74729f00..7ac9844f 100644
--- a/VisualC-WinRT/SDL_ttf-UWP.sln
+++ b/VisualC-WinRT/SDL_ttf-UWP.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31911.196
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_ttf-UWP", "SDL_ttf-UWP.vcxproj", "{18665277-E558-4484-93F4-E4DC7BB614CB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_ttf-UWP", "SDL_ttf-UWP.vcxproj", "{18665277-E558-4484-93F4-E4DC7BB614CB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/VisualC-WinRT/SDL_ttf-UWP.vcxproj b/VisualC-WinRT/SDL_ttf-UWP.vcxproj
index b2dff647..7040b900 100644
--- a/VisualC-WinRT/SDL_ttf-UWP.vcxproj
+++ b/VisualC-WinRT/SDL_ttf-UWP.vcxproj
@@ -125,8 +125,8 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{18665277-e558-4484-93f4-e4dc7bb614cb}</ProjectGuid>
<Keyword>DynamicLibrary</Keyword>
- <ProjectName>SDL2_ttf-UWP</ProjectName>
- <RootNamespace>SDL2_ttf_UWP</RootNamespace>
+ <ProjectName>SDL3_ttf-UWP</ProjectName>
+ <RootNamespace>SDL3_ttf_UWP</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
@@ -188,42 +188,42 @@
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
- <TargetName>SDL2_ttf</TargetName>
+ <TargetName>SDL3_ttf</TargetName>
<IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
- <TargetName>SDL2_ttf</TargetName>
+ <TargetName>SDL3_ttf</TargetName>
<IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
- <TargetName>SDL2_ttf</TargetName>
+ <TargetName>SDL3_ttf</TargetName>
<IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
- <TargetName>SDL2_ttf</TargetName>
+ <TargetName>SDL3_ttf</TargetName>
<IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
- <TargetName>SDL2_ttf</TargetName>
+ <TargetName>SDL3_ttf</TargetName>
<IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<IntDir>Objs\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
- <TargetName>SDL2_ttf</TargetName>
+ <TargetName>SDL3_ttf</TargetName>
<IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -307,4 +307,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC/SDL_ttf.sln b/VisualC/SDL_ttf.sln
index 698147bf..b7773075 100644
--- a/VisualC/SDL_ttf.sln
+++ b/VisualC/SDL_ttf.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_ttf", "SDL_ttf.vcxproj", "{DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_ttf", "SDL_ttf.vcxproj", "{DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "showfont", "showfont\showfont.vcxproj", "{7B1F60CD-2A09-4514-937C-D9DD044428FB}"
EndProject
diff --git a/VisualC/SDL_ttf.vcxproj b/VisualC/SDL_ttf.vcxproj
index c016d271..a9d01807 100644
--- a/VisualC/SDL_ttf.vcxproj
+++ b/VisualC/SDL_ttf.vcxproj
@@ -19,7 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>SDL2_ttf</ProjectName>
+ <ProjectName>SDL3_ttf</ProjectName>
<ProjectGuid>{DDDBD07D-DC76-4AF6-8D02-3E2DEB6EE255}</ProjectGuid>
<RootNamespace>SDL_ttf</RootNamespace>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -85,19 +85,19 @@
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
+ <IncludePath>..\include;..\external\freetype\include;..\external\harfbuzz\src;$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\..\SDL\VisualC\$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
+ <IncludePath>..\include;..\external\freetype\include;..\external\harfbuzz\src;$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\..\SDL\VisualC\$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
+ <IncludePath>..\include;..\external\freetype\include;..\external\harfbuzz\src;$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\..\SDL\VisualC\$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IncludePath>..\external\freetype\include;..\external\harfbuzz\src;$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
+ <IncludePath>..\include;..\external\freetype\include;..\external\harfbuzz\src;$(SolutionDir)..\..\SDL\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\..\SDL\VisualC\$(PlatformName)\$(Configuration);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -106,7 +106,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Debug/SDL2_ttf.tlb</TypeLibraryName>
+ <TypeLibraryName>.\Debug/SDL3_ttf.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -122,7 +122,7 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>SDL2.lib;ucrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>SDL3.lib;ucrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>external\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -134,7 +134,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>.\Debug/SDL2_ttf.tlb</TypeLibraryName>
+ <TypeLibraryName>.\Debug/SDL3_ttf.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -149,7 +149,7 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>SDL2.lib;ucrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>SDL3.lib;ucrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>external\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -161,7 +161,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>.\Release/SDL2_ttf.tlb</TypeLibraryName>
+ <TypeLibraryName>.\Release/SDL3_ttf.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -175,7 +175,7 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>external\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
</Link>
@@ -186,7 +186,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
<SuppressStartupBanner>true</SuppressStartupBanner>
<TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>.\Release/SDL2_ttf.tlb</TypeLibraryName>
+ <TypeLibraryName>.\Release/SDL3_ttf.tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
@@ -199,7 +199,7 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
- <AdditionalDependencies>SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>external\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem>Windows</SubSystem>
</Link>
diff --git a/VisualC/glfont/glfont.vcxproj b/VisualC/glfont/glfont.vcxproj
index 9da70af8..c3d2c6ec 100644
--- a/VisualC/glfont/glfont.vcxproj
+++ b/VisualC/glfont/glfont.vcxproj
@@ -119,7 +119,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
@@ -149,7 +149,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
@@ -181,7 +181,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
@@ -214,7 +214,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
@@ -244,4 +244,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC/pkg-support/cmake/sdl2_ttf-config-version.cmake b/VisualC/pkg-support/cmake/sdl2_ttf-config-version.cmake
index 85aef6f8..d95575d9 100644
--- a/VisualC/pkg-support/cmake/sdl2_ttf-config-version.cmake
+++ b/VisualC/pkg-support/cmake/sdl2_ttf-config-version.cmake
@@ -1,14 +1,14 @@
# based on the files generated by CMake's write_basic_package_version_file
-# SDL2_ttf CMake version configuration file:
-# This file is meant to be placed in a cmake subfolder of SDL2_ttf-devel-2.x.y-VC
+# SDL3_ttf CMake version configuration file:
+# This file is meant to be placed in a cmake subfolder of SDL3_ttf-devel-2.x.y-VC
-if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../include/SDL_ttf.h")
- message(AUTHOR_WARNING "Could not find SDL_ttf.h. This script is meant to be placed in a CMake subfolder of SDL2_ttf-devel-2.x.y-VC")
+if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../include/SDL3/SDL_ttf.h")
+ message(AUTHOR_WARNING "Could not find SDL_ttf.h. This script is meant to be placed in a CMake subfolder of SDL3_ttf-devel-3.x.y-VC")
return()
endif()
-file(READ "${CMAKE_CURRENT_LIST_DIR}/../include/SDL_ttf.h" _sdl_ttf_h)
+file(READ "${CMAKE_CURRENT_LIST_DIR}/../include/SDL3/SDL_ttf.h" _sdl_ttf_h)
string(REGEX MATCH "#define[ \t]+SDL_TTF_MAJOR_VERSION[ \t]+([0-9]+)" _sdl_major_re "${_sdl_ttf_h}")
set(_sdl_major "${CMAKE_MATCH_1}")
string(REGEX MATCH "#define[ \t]+SDL_TTF_MINOR_VERSION[ \t]+([0-9]+)" _sdl_minor_re "${_sdl_ttf_h}")
diff --git a/VisualC/pkg-support/cmake/sdl2_ttf-config.cmake b/VisualC/pkg-support/cmake/sdl2_ttf-config.cmake
index 540bde3b..042523ba 100644
--- a/VisualC/pkg-support/cmake/sdl2_ttf-config.cmake
+++ b/VisualC/pkg-support/cmake/sdl2_ttf-config.cmake
@@ -1,20 +1,20 @@
-# SDL2_image CMake configuration file:
-# This file is meant to be placed in a cmake subfolder of SDL2_image-devel-2.x.y-VC
+# SDL3_image CMake configuration file:
+# This file is meant to be placed in a cmake subfolder of SDL3_image-devel-2.x.y-VC
include(FeatureSummary)
-set_package_properties(SDL2_ttf PROPERTIES
+set_package_properties(SDL3_ttf PROPERTIES
URL "https://www.libsdl.org/projects/SDL_ttf/"
DESCRIPTION "Support for TrueType (.ttf) font files with Simple Directmedia Layer"
)
cmake_minimum_required(VERSION 3.0)
-set(SDL2_ttf_FOUND TRUE)
+set(SDL3_ttf_FOUND TRUE)
-set(SDL2TTF_VENDORED TRUE)
+set(SDL3TTF_VENDORED TRUE)
-set(SDL2TTF_HARFBUZZ TRUE)
-set(SDL2TTF_FREETYPE TRUE)
+set(SDL3TTF_HARFBUZZ TRUE)
+set(SDL3TTF_FREETYPE TRUE)
if(CMAKE_SIZEOF_VOID_P STREQUAL "4")
set(_sdl_arch_subdir "x86")
@@ -22,30 +22,30 @@ elseif(CMAKE_SIZEOF_VOID_P STREQUAL "8")
set(_sdl_arch_subdir "x64")
else()
unset(_sdl_arch_subdir)
- set(SDL2_image_FOUND FALSE)
+ set(SDL3_image_FOUND FALSE)
return()
endif()
-set(_sdl2ttf_incdir "${CMAKE_CURRENT_LIST_DIR}/../include")
-set(_sdl2ttf_library "${CMAKE_CURRENT_LIST_DIR}/../lib/${_sdl_arch_subdir}/SDL2_ttf.lib")
-set(_sdl2ttf_dll "${CMAKE_CURRENT_LIST_DIR}/../lib/${_sdl_arch_subdir}/SDL2_ttf.dll")
+set(_sdl3ttf_incdir "${CMAKE_CURRENT_LIST_DIR}/../include")
+set(_sdl3ttf_library "${CMAKE_CURRENT_LIST_DIR}/../lib/${_sdl_arch_subdir}/SDL3_ttf.lib")
+set(_sdl3ttf_dll "${CMAKE_CURRENT_LIST_DIR}/../lib/${_sdl_arch_subdir}/SDL3_ttf.dll")
# All targets are created, even when some might not be requested though COMPONENTS.
-# This is done for compatibility with CMake generated SDL2_image-target.cmake files.
+# This is done for compatibility with CMake generated SDL3_image-target.cmake files.
-if(NOT TARGET SDL2_ttf::SDL2_ttf)
- add_library(SDL2_ttf::SDL2_ttf SHARED IMPORTED)
- set_target_properties(SDL2_ttf::SDL2_ttf
+if(NOT TARGET SDL3_ttf::SDL3_ttf)
+ add_library(SDL3_ttf::SDL3_ttf SHARED IMPORTED)
+ set_target_properties(SDL3_ttf::SDL3_ttf
PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${_sdl2ttf_incdir}"
- IMPORTED_IMPLIB "${_sdl2ttf_library}"
- IMPORTED_LOCATION "${_sdl2ttf_dll}"
- COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED"
- INTERFACE_SDL2_SHARED "ON"
+ INTERFACE_INCLUDE_DIRECTORIES "${_sdl3ttf_incdir}"
+ IMPORTED_IMPLIB "${_sdl3ttf_library}"
+ IMPORTED_LOCATION "${_sdl3ttf_dll}"
+ COMPATIBLE_INTERFACE_BOOL "SDL3_SHARED"
+ INTERFACE_SDL3_SHARED "ON"
)
endif()
unset(_sdl_arch_subdir)
-unset(_sdl2ttf_incdir)
-unset(_sdl2ttf_library)
-unset(_sdl2ttf_dll)
+unset(_sdl3ttf_incdir)
+unset(_sdl3ttf_library)
+unset(_sdl3ttf_dll)
diff --git a/VisualC/showfont/showfont.vcxproj b/VisualC/showfont/showfont.vcxproj
index a7b3828d..5e78a7c2 100644
--- a/VisualC/showfont/showfont.vcxproj
+++ b/VisualC/showfont/showfont.vcxproj
@@ -119,7 +119,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
@@ -149,7 +149,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
<PostBuildEvent>
@@ -181,7 +181,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
@@ -214,7 +214,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
</Link>
@@ -244,4 +244,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Xcode/SDL_ttf.xcodeproj/project.pbxproj b/Xcode/SDL_ttf.xcodeproj/project.pbxproj
index b355620f..ba0b186b 100644
--- a/Xcode/SDL_ttf.xcodeproj/project.pbxproj
+++ b/Xcode/SDL_ttf.xcodeproj/project.pbxproj
@@ -11,7 +11,7 @@
BE48FD5F07AFA17000BB41DA /* SDL_ttf.h in Headers */ = {isa = PBXBuildFile; fileRef = 1014BAEA010A4B677F000001 /* SDL_ttf.h */; settings = {ATTRIBUTES = (Public, ); }; };
BE48FD6207AFA17000BB41DA /* SDL_ttf.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D67A01CD962A01F3E8B9 /* SDL_ttf.c */; };
BE48FD6B07AFA17000BB41DA /* SDL_ttf.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D67A01CD962A01F3E8B9 /* SDL_ttf.c */; };
- BE48FD8407AFA29000BB41DA /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE48FD8307AFA29000BB41DA /* SDL2.framework */; };
+ BE48FD8407AFA29000BB41DA /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE48FD8307AFA29000BB41DA /* SDL3.framework */; };
F307EE29282738F8003915D7 /* svg.c in Sources */ = {isa = PBXBuildFile; fileRef = F307EE28282738F8003915D7 /* svg.c */; };
F307EE2A282738F8003915D7 /* svg.c in Sources */ = {isa = PBXBuildFile; fileRef = F307EE28282738F8003915D7 /* svg.c */; };
F307EE2C282807EB003915D7 /* hb-ms-feature-ranges.cc in Sources */ = {isa = PBXBuildFile; fileRef = F307EE2B282807EB003915D7 /* hb-ms-feature-ranges.cc */; };
@@ -216,13 +216,13 @@
/* Begin PBXFileReference section */
1014BAEA010A4B677F000001 /* SDL_ttf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_ttf.h; path = ../SDL_ttf.h; sourceTree = SOURCE_ROOT; };
7FC2F5DB285AC0D600836845 /* CMake */ = {isa = PBXFileReference; lastKnownFileType = folder; path = CMake; sourceTree = "<group>"; };
- A75FDB0C23E37ED200529352 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = iOS/SDL2.framework; sourceTree = "<group>"; };
- A75FDB1023E37EE400529352 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = tvOS/SDL2.framework; sourceTree = "<group>"; };
+ A75FDB0C23E37ED200529352 /* SDL3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL3.framework; path = iOS/SDL3.framework; sourceTree = "<group>"; };
+ A75FDB1023E37EE400529352 /* SDL3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL3.framework; path = tvOS/SDL3.framework; sourceTree = "<group>"; };
BE48FD6607AFA17000BB41DA /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = "<group>"; };
- BE48FD6707AFA17000BB41DA /* SDL2_ttf.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL2_ttf.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- BE48FD6E07AFA17000BB41DA /* libSDL2_ttf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2_ttf.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ BE48FD6707AFA17000BB41DA /* SDL3_ttf.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL3_ttf.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ BE48FD6E07AFA17000BB41DA /* libSDL3_ttf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL3_ttf.a; sourceTree = BUILT_PRODUCTS_DIR; };
BE48FD7207AFA17000BB41DA /* Create DMG */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Create DMG"; sourceTree = BUILT_PRODUCTS_DIR; };
- BE48FD8307AFA29000BB41DA /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2.framework; sourceTree = "<group>"; };
+ BE48FD8307AFA29000BB41DA /* SDL3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL3.framework; sourceTree = "<group>"; };
F307EE28282738F8003915D7 /* svg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = svg.c; path = ../external/freetype/src/svg/svg.c; sourceTree = "<group>"; };
F307EE2B282807EB003915D7 /* hb-ms-feature-ranges.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "hb-ms-feature-ranges.cc"; path = "../external/harfbuzz/src/hb-ms-feature-ranges.cc"; sourceTree = "<group>"; };
F364A5B72620E1A200325ECE /* FTL.TXT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = FTL.TXT; path = ../../../external/freetype/docs/FTL.TXT; sourceTree = "<group>"; };
@@ -322,7 +322,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- BE48FD8407AFA29000BB41DA /* SDL2.framework in Frameworks */,
+ BE48FD8407AFA29000BB41DA /* SDL3.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -348,8 +348,8 @@
isa = PBXGroup;
children = (
089C1665FE841158C02AAC07 /* Resources */,
- BE48FD6707AFA17000BB41DA /* SDL2_ttf.framework */,
- BE48FD6E07AFA17000BB41DA /* libSDL2_ttf.a */,
+ BE48FD6707AFA17000BB41DA /* SDL3_ttf.framework */,
+ BE48FD6E07AFA17000BB41DA /* libSDL3_ttf.a */,
BE48FD7207AFA17000BB41DA /* Create DMG */,
);
name = Products;
@@ -388,7 +388,7 @@
A75FDAE023E3493000529352 /* macOS */ = {
isa = PBXGroup;
children = (
- BE48FD8307AFA29000BB41DA /* SDL2.framework */,
+ BE48FD8307AFA29000BB41DA /* SDL3.framework */,
);
path = macOS;
sourceTree = "<group>";
@@ -396,7 +396,7 @@
A75FDAE123E3496200529352 /* iOS */ = {
isa = PBXGroup;
children = (
- A75FDB0C23E37ED200529352 /* SDL2.framework */,
+ A75FDB0C23E37ED200529352 /* SDL3.framework */,
);
name = iOS;
sourceTree = "<group>";
@@ -404,7 +404,7 @@
A75FDAE223E3496700529352 /* tvOS */ = {
isa = PBXGroup;
children = (
- A75FDB1023E37EE400529352 /* SDL2.framework */,
+ A75FDB1023E37EE400529352 /* SDL3.framework */,
);
name = tvOS;
sourceTree = "<group>";
@@ -589,7 +589,7 @@
name = Framework;
productInstallPath = "@executable_path/../Frameworks";
productName = SDL_ttf;
- productReference = BE48FD6707AFA17000BB41DA /* SDL2_ttf.framework */;
+ productReference = BE48FD6707AFA17000BB41DA /* SDL3_ttf.framework */;
productType = "com.apple.product-type.framework";
};
BE48FD6807AFA17000BB41DA /* Static Library */ = {
@@ -608,7 +608,7 @@
name = "Static Library";
productInstallPath = /usr/local/lib;
productName = "Static Library";
- productReference = BE48FD6E07AFA17000BB41DA /* libSDL2_ttf.a */;
+ productReference = BE48FD6E07AFA17000BB41DA /* libSDL3_ttf.a */;
productType = "com.apple.product-type.library.static";
};
BE48FD6F07AFA17000BB41DA /* Create DMG */ = {
@@ -701,7 +701,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "cd \"$BUILT_PRODUCTS_DIR/$PUBLIC_HEADERS_FOLDER_PATH\"\nsed -i '' -e 's,#include \"\\(.*\\)\",#include <SDL2/\\1>,' *.h\n";
+ shellScript = "cd \"$BUILT_PRODUCTS_DIR/$PUBLIC_HEADERS_FOLDER_PATH\"\nsed -i '' -e 's,#include \"\\(.*\\)\",#include <SDL3/\\1>,' *.h\n";
};
BE48FD7107AFA17000BB41DA /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -710,7 +710,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "PRODUCT_NAME=SDL2_ttf\n\n# Sign framework\nif [ \"$SDL_CODESIGN_IDENTITY\" != \"\" ]; then\n codesign --force --deep --sign \"$SDL_CODESIGN_IDENTITY\" $TARGET_BUILD_DIR/$PRODUCT_NAME.framework/Versions/A || exit $?\nfi\n\n# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\ncp -a $TARGET_BUILD_DIR/*.framework build/dmg-tmp/\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nrm -rf build/dmg-tmp/.DS_Store\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname $PRODUCT_NAME -srcfolder build/dmg-tmp build/$PRODUCT_NAME.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n";
+ shellScript = "PRODUCT_NAME=SDL3_ttf\n\n# Sign framework\nif [ \"$SDL_CODESIGN_IDENTITY\" != \"\" ]; then\n codesign --force --deep --sign \"$SDL_CODESIGN_IDENTITY\" $TARGET_BUILD_DIR/$PRODUCT_NAME.framework/Versions/A || exit $?\nfi\n\n# clean up the framework, remove headers, extra files\nmkdir -p build/dmg-tmp\ncp -a $TARGET_BUILD_DIR/*.framework build/dmg-tmp/\ncp pkg-support/resources/ReadMe.txt build/dmg-tmp\n\n# remove the .DS_Store files if any (we may want to provide one in the future for fancy .dmgs)\nrm -rf build/dmg-tmp/.DS_Store\n\n# create the dmg\nhdiutil create -ov -fs HFS+ -volname $PRODUCT_NAME -srcfolder build/dmg-tmp build/$PRODUCT_NAME.dmg\n\n# clean up\nrm -rf build/dmg-tmp\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -998,7 +998,7 @@
"TTF_USE_HARFBUZZ=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
- HEADER_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)/SDL2.framework/Headers\"";
+ HEADER_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)/SDL3.framework/Headers\"";
INFOPLIST_FILE = "Info-Framework.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1008,8 +1008,8 @@
"PLATFORM[sdk=appletvos*]" = tvOS;
"PLATFORM[sdk=iphoneos*]" = iOS;
"PLATFORM[sdk=macosx*]" = macOS;
- PRODUCT_BUNDLE_IDENTIFIER = "org.libsdl.SDL2-ttf";
- PRODUCT_NAME = SDL2_ttf;
+ PRODUCT_BUNDLE_IDENTIFIER = "org.libsdl.SDL3-ttf";
+ PRODUCT_NAME = SDL3_ttf;
SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos";
SUPPORTS_MACCATALYST = YES;
TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -1037,7 +1037,7 @@
"TTF_USE_HARFBUZZ=1",
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
- HEADER_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)/SDL2.framework/Headers\"";
+ HEADER_SEARCH_PATHS = "\"$(SRCROOT)/$(PLATFORM)/SDL3.framework/Headers\"";
INFOPLIST_FILE = "Info-Framework.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1046,8 +1046,8 @@
"PLATFORM[sdk=appletvos*]" = tvOS;
"PLATFORM[sdk=iphoneos*]" = iOS;
"PLATFORM[sdk=macosx*]" = macOS;
- PRODUCT_BUNDLE_IDENTIFIER = "org.libsdl.SDL2-ttf";
- PRODUCT_NAME = SDL2_ttf;
+ PRODUCT_BUNDLE_IDENTIFIER = "org.li
(Patch may be truncated, please check the link at the top of this post.)