diff --git a/.gitmodules b/.gitmodules index 0474246..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +0,0 @@ -[submodule "submodules/SDL_ttf"] - path = submodules/SDL_ttf - url = https://github.com/libsdl-org/SDL_ttf.git - shallow = true -[submodule "submodules/SDL"] - path = submodules/SDL - url = https://github.com/libsdl-org/SDL.git - shallow = true diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dc99d0..865bc98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,5 @@ 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 1fbd159..6be790e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,8 @@ add_library(SDL_FPSCounter STATIC SDL_FPSCounter.c) +find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3-shared) +find_package(SDL3_ttf REQUIRED CONFIG REQUIRED COMPONENTS SDL3_ttf-shared) + add_executable(fps-counter WIN32 main.c) + target_link_libraries(fps-counter PRIVATE SDL_FPSCounter SDL3_ttf::SDL3_ttf SDL3::SDL3) diff --git a/submodules/SDL b/submodules/SDL deleted file mode 160000 index 7ab1412..0000000 --- a/submodules/SDL +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ab1412e208e8fca12f99caae665de61e9fcf5a6 diff --git a/submodules/SDL_ttf b/submodules/SDL_ttf deleted file mode 160000 index aaab1b9..0000000 --- a/submodules/SDL_ttf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aaab1b9e98e8bbca572064ceb23f0fd916b2add5