andrew/libakgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import all dependencies as submodules, make cmake do the right thing

Browse Source
This commit is contained in:
Andrew Kesterson
2026-05-12 16:45:42 -04:00
parent 5439b8004b
commit ccd26494d9
10 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
.gitmodules vendored
View File

@@ -1,3 +1,24 @@
[submodule "deps/semver"] [submodule "deps/semver"]
path = deps/semver path = deps/semver
url = git@github.com:h2non/semver.c.git url = git@github.com:h2non/semver.c.git
[submodule "deps/SDL"]
path = deps/SDL
url = git@github.com:libsdl-org/SDL.git
[submodule "deps/SDL_image"]
path = deps/SDL_image
url = git@github.com:libsdl-org/SDL_image.git
[submodule "deps/SDL_mixer"]
path = deps/SDL_mixer
url = git@github.com:libsdl-org/SDL_mixer.git
[submodule "deps/SDL_ttf"]
path = deps/SDL_ttf
url = git@github.com:libsdl-org/SDL_ttf.git
[submodule "deps/libsdlerror"]
path = deps/libakerror
url = https://source.home.aklabs.net/andrew/libsdlerror.git
[submodule "deps/libakstdlib"]
path = deps/libakstdlib
url = https://source.home.aklabs.net/andrew/libakstdlib.git
[submodule "deps/jansson"]
path = deps/jansson
url = git@github.com:akheron/jansson.git

43
CMakeLists.txt
View File

@@ -3,22 +3,13 @@ project(akgl LANGUAGES C)
include(CTest) include(CTest)
find_package(PkgConfig REQUIRED) add_subdirectory(deps/jansson EXCLUDE_FROM_ALL)
find_package(SDL3 REQUIRED) add_subdirectory(deps/libakerror EXCLUDE_FROM_ALL)
find_package(SDL3_image REQUIRED) add_subdirectory(deps/libakstdlib EXCLUDE_FROM_ALL)
find_package(SDL3_mixer REQUIRED) add_subdirectory(deps/SDL EXCLUDE_FROM_ALL)
find_package(SDL3_ttf REQUIRED) add_subdirectory(deps/SDL_image EXCLUDE_FROM_ALL)
find_package(akerror REQUIRED) add_subdirectory(deps/SDL_mixer EXCLUDE_FROM_ALL)
find_package(akstdlib REQUIRED) add_subdirectory(deps/SDL_ttf EXCLUDE_FROM_ALL)
find_package(jansson REQUIRED)
find_package(box2d REQUIRED)
# Check for SDL3 using pkg-config
#pkg_check_modules(SDL3 REQUIRED sdl3)
#pkg_check_modules(SDL3_image REQUIRED sdl3-image)
#pkg_check_modules(SDL3_mixer REQUIRED sdl3-mixer)
#pkg_check_modules(jansson REQUIRED jansson)
#pkg_check_modules(akerror REQUIRED akerror)
set(GAMECONTROLLERDB_H "include/akgl/SDL_GameControllerDB.h") set(GAMECONTROLLERDB_H "include/akgl/SDL_GameControllerDB.h")
set(prefix ${CMAKE_INSTALL_PREFIX}) set(prefix ${CMAKE_INSTALL_PREFIX})
@@ -89,18 +80,20 @@ target_link_libraries(akgl
SDL3_mixer::SDL3_mixer SDL3_mixer::SDL3_mixer
SDL3_ttf::SDL3_ttf SDL3_ttf::SDL3_ttf
akstdlib::akstdlib akstdlib::akstdlib
akerror::akerror
jansson::jansson
) )
target_link_libraries(test_actor PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) target_link_libraries(test_actor PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer jansson::jansson -lm)
target_link_libraries(test_bitmasks PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) target_link_libraries(test_bitmasks PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer jansson::jansson -lm)
target_link_libraries(test_character PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) target_link_libraries(test_character PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer jansson::jansson -lm)
target_link_libraries(test_registry PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) target_link_libraries(test_registry PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer jansson::jansson -lm)
target_link_libraries(test_sprite PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) target_link_libraries(test_sprite PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer jansson::jansson -lm)
target_link_libraries(test_staticstring PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) target_link_libraries(test_staticstring PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer jansson::jansson -lm)
target_link_libraries(test_tilemap PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) target_link_libraries(test_tilemap PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer jansson::jansson -lm)
target_link_libraries(test_util PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) target_link_libraries(test_util PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer jansson::jansson -lm)
target_link_libraries(charviewer PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) target_link_libraries(charviewer PRIVATE akstdlib::akstdlib akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer jansson::jansson -lm)
set(main_lib_dest "lib/akgl-${MY_LIBRARY_VERSION}") set(main_lib_dest "lib/akgl-${MY_LIBRARY_VERSION}")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/akgl.pc DESTINATION "lib/pkgconfig/") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/akgl.pc DESTINATION "lib/pkgconfig/")

1
deps/SDL vendored Submodule

Submodule deps/SDL added at d9d5536704

1
deps/SDL_image vendored Submodule

Submodule deps/SDL_image added at bec9134a26

1
deps/SDL_mixer vendored Submodule

Submodule deps/SDL_mixer added at a5e1890afc

1
deps/SDL_ttf vendored Submodule

Submodule deps/SDL_ttf added at a1ce3670ae

1
deps/jansson vendored Submodule

Submodule deps/jansson added at 1eb7a81297

1
deps/libakerror vendored Submodule

Submodule deps/libakerror added at 51b6b23b4c

1
deps/libakstdlib vendored Submodule

Submodule deps/libakstdlib added at 4bd03f267a

2
include/akgl/SDL_GameControllerDB.h
View File

@@ -1,7 +1,7 @@
#ifndef _SDL_GAMECONTROLLERDB_H_ #ifndef _SDL_GAMECONTROLLERDB_H_
#define _SDL_GAMECONTROLLERDB_H_ #define _SDL_GAMECONTROLLERDB_H_
// Taken from https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/refs/heads/master/gamecontrollerdb.txt on Tue May 12 03:18:39 PM EDT 2026 // Taken from https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/refs/heads/master/gamecontrollerdb.txt on Tue May 12 04:45:15 PM EDT 2026
#define AKGL_SDL_GAMECONTROLLER_DB_LEN 2228 #define AKGL_SDL_GAMECONTROLLER_DB_LEN 2228