From 0fb4821b37c9c2a53867f0031d35709b3228bca6 Mon Sep 17 00:00:00 2001 From: VegOwOtenks Date: Sat, 1 Mar 2025 00:06:42 +0100 Subject: [PATCH] Successfully building SDL3 is a pain --- .gitmodules | 1 - CMakeLists.txt | 6 ++++++ src/CMakeLists.txt | 2 +- src/main.c | 4 ++-- submodules/SDL | 1 + submodules/SDL_ttf | 1 + 6 files changed, 11 insertions(+), 4 deletions(-) create mode 160000 submodules/SDL create mode 160000 submodules/SDL_ttf diff --git a/.gitmodules b/.gitmodules index a8fbf12..ea62cf6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,4 +4,3 @@ [submodule "submodules/SDL"] path = submodules/SDL url = https://github.com/libsdl-org/SDL.git - diff --git a/CMakeLists.txt b/CMakeLists.txt index 865bc98..4dc99d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,11 @@ cmake_minimum_required(VERSION 3.30) +# This assumes the SDL source is available in vendored/SDL +add_subdirectory(submodules/SDL EXCLUDE_FROM_ALL) + +# This assumes the SDL_ttf source is available in vendored/SDL_ttf +add_subdirectory(submodules/SDL_ttf EXCLUDE_FROM_ALL) + project(SDL_FPSCounter C) add_subdirectory(src/) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6179702..1fbd159 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ add_library(SDL_FPSCounter STATIC SDL_FPSCounter.c) add_executable(fps-counter WIN32 main.c) -target_link_libraries(fps-counter SDL_FPSCounter SDL3 SDL3_ttf) +target_link_libraries(fps-counter PRIVATE SDL_FPSCounter SDL3_ttf::SDL3_ttf SDL3::SDL3) diff --git a/src/main.c b/src/main.c index bd1d234..f2c88c0 100644 --- a/src/main.c +++ b/src/main.c @@ -44,8 +44,8 @@ int main(int argc, char* argv[]) (void) argv; SDL_Init( SDL_INIT_VIDEO | SDL_INIT_EVENTS); - if (TTF_Init()) { - fprintf(stderr, "Initializing SDL2_ttf failed: %s\n", SDL_GetError()); + if (!TTF_Init()) { + fprintf(stderr, "Initializing SDL3_ttf failed: %s\n", SDL_GetError()); } SDL_Window* window = SDL_CreateWindow( diff --git a/submodules/SDL b/submodules/SDL new file mode 160000 index 0000000..7ab1412 --- /dev/null +++ b/submodules/SDL @@ -0,0 +1 @@ +Subproject commit 7ab1412e208e8fca12f99caae665de61e9fcf5a6 diff --git a/submodules/SDL_ttf b/submodules/SDL_ttf new file mode 160000 index 0000000..aaab1b9 --- /dev/null +++ b/submodules/SDL_ttf @@ -0,0 +1 @@ +Subproject commit aaab1b9e98e8bbca572064ceb23f0fd916b2add5