From a0b2dda4cf6173417b139b2d71d660bfb9abeb42 Mon Sep 17 00:00:00 2001 From: Andrew Kesterson Date: Thu, 7 May 2026 22:20:10 -0400 Subject: [PATCH] Rename library to AKGL (AKLabs Game Library) --- CMakeLists.txt | 70 +++++++++---------- sdl3game.pc.in => akgl.pc.in | 0 .../{sdl3game => akgl}/SDL_GameControllerDB.h | 2 +- include/{sdl3game => akgl}/actor.h | 0 include/{sdl3game => akgl}/assets.h | 0 include/{sdl3game => akgl}/character.h | 0 include/{sdl3game => akgl}/controller.h | 0 include/{sdl3game => akgl}/draw.h | 0 include/{sdl3game => akgl}/error.h | 0 include/{sdl3game => akgl}/game.h | 0 include/{sdl3game => akgl}/heap.h | 0 include/{sdl3game => akgl}/iterator.h | 0 include/{sdl3game => akgl}/json_helpers.h | 0 include/{sdl3game => akgl}/registry.h | 0 include/{sdl3game => akgl}/sprite.h | 0 include/{sdl3game => akgl}/staticstring.h | 0 include/{sdl3game => akgl}/text.h | 0 include/{sdl3game => akgl}/tilemap.h | 0 include/{sdl3game => akgl}/util.h | 0 mkcontrollermappings.sh | 10 +-- rebuild.sh | 2 +- src/actor.c | 14 ++-- src/assets.c | 8 +-- src/character.c | 16 ++--- src/controller.c | 8 +-- src/draw.c | 2 +- src/game.c | 18 ++--- src/heap.c | 14 ++-- src/json_helpers.c | 10 +-- src/registry.c | 8 +-- src/sprite.c | 14 ++-- src/staticstring.c | 2 +- src/text.c | 6 +- src/tilemap.c | 14 ++-- src/util.c | 8 +-- tests/actor.c | 8 +-- tests/bitmasks.c | 4 +- tests/character.c | 14 ++-- tests/charviewer.c | 26 +++---- tests/registry.c | 2 +- tests/sprite.c | 12 ++-- tests/staticstring.c | 4 +- tests/tilemap.c | 16 ++--- tests/util.c | 2 +- util/charviewer.c | 26 +++---- 45 files changed, 170 insertions(+), 170 deletions(-) rename sdl3game.pc.in => akgl.pc.in (100%) rename include/{sdl3game => akgl}/SDL_GameControllerDB.h (99%) rename include/{sdl3game => akgl}/actor.h (100%) rename include/{sdl3game => akgl}/assets.h (100%) rename include/{sdl3game => akgl}/character.h (100%) rename include/{sdl3game => akgl}/controller.h (100%) rename include/{sdl3game => akgl}/draw.h (100%) rename include/{sdl3game => akgl}/error.h (100%) rename include/{sdl3game => akgl}/game.h (100%) rename include/{sdl3game => akgl}/heap.h (100%) rename include/{sdl3game => akgl}/iterator.h (100%) rename include/{sdl3game => akgl}/json_helpers.h (100%) rename include/{sdl3game => akgl}/registry.h (100%) rename include/{sdl3game => akgl}/sprite.h (100%) rename include/{sdl3game => akgl}/staticstring.h (100%) rename include/{sdl3game => akgl}/text.h (100%) rename include/{sdl3game => akgl}/tilemap.h (100%) rename include/{sdl3game => akgl}/util.h (100%) mode change 100755 => 100644 rebuild.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 31726f2..a06eb39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(sdl3game LANGUAGES C) +project(akgl LANGUAGES C) include(CTest) @@ -19,12 +19,12 @@ find_package(box2d REQUIRED) #pkg_check_modules(jansson REQUIRED jansson) #pkg_check_modules(akerror REQUIRED akerror) -set(GAMECONTROLLERDB_H "include/sdl3game/SDL_GameControllerDB.h") +set(GAMECONTROLLERDB_H "include/akgl/SDL_GameControllerDB.h") set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") set(libdir "\${exec_prefix}/lib") set(includedir "\${prefix}/include") -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sdl3game.pc.in ${CMAKE_CURRENT_BINARY_DIR}/sdl3game.pc @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/akgl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/akgl.pc @ONLY) add_custom_command( OUTPUT ${GAMECONTROLLERDB_H} @@ -34,7 +34,7 @@ add_custom_command( # Add include directories include_directories(${SDL3_INCLUDE_DIRS}) -add_library(sdl3game SHARED +add_library(akgl SHARED src/actor.c src/actor_state_string_names.c src/text.c @@ -74,11 +74,11 @@ add_test(NAME tilemap COMMAND test_tilemap) add_test(NAME util COMMAND test_util) # Specify include directories for the library's headers (if applicable) -target_include_directories(sdl3game PUBLIC +target_include_directories(akgl PUBLIC include/ ) -target_link_libraries(sdl3game +target_link_libraries(akgl PUBLIC SDL3::SDL3 SDL3_image::SDL3_image @@ -86,34 +86,34 @@ target_link_libraries(sdl3game SDL3_ttf::SDL3_ttf ) -target_link_libraries(test_actor PRIVATE akerror::akerror sdl3game 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 akerror::akerror sdl3game 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 akerror::akerror sdl3game 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 akerror::akerror sdl3game 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 akerror::akerror sdl3game 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 akerror::akerror sdl3game 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 akerror::akerror sdl3game 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 akerror::akerror sdl3game 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 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 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 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 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 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 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 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 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 akerror::akerror sdl3game SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) +target_link_libraries(charviewer PRIVATE akerror::akerror akgl SDL3::SDL3 SDL3_ttf::SDL3_ttf SDL3_image::SDL3_image SDL3_mixer::SDL3_mixer box2d::box2d jansson::jansson -lm) -set(main_lib_dest "lib/sdl3game-${MY_LIBRARY_VERSION}") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sdl3game.pc DESTINATION "lib/pkgconfig/") -install(TARGETS sdl3game DESTINATION "lib/") -install(FILES "include/sdl3game/actor.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/text.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/assets.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/character.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/error.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/draw.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/game.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/controller.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/heap.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/iterator.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/json_helpers.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/registry.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/sprite.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/staticstring.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/tilemap.h" DESTINATION "include/sdl3game/") -install(FILES "include/sdl3game/util.h" DESTINATION "include/sdl3game/") -install(FILES ${GAMECONTROLLERDB_H} DESTINATION "include/sdl3game/") +set(main_lib_dest "lib/akgl-${MY_LIBRARY_VERSION}") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/akgl.pc DESTINATION "lib/pkgconfig/") +install(TARGETS akgl DESTINATION "lib/") +install(FILES "include/akgl/actor.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/text.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/assets.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/character.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/error.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/draw.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/game.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/controller.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/heap.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/iterator.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/json_helpers.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/registry.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/sprite.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/staticstring.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/tilemap.h" DESTINATION "include/akgl/") +install(FILES "include/akgl/util.h" DESTINATION "include/akgl/") +install(FILES ${GAMECONTROLLERDB_H} DESTINATION "include/akgl/") diff --git a/sdl3game.pc.in b/akgl.pc.in similarity index 100% rename from sdl3game.pc.in rename to akgl.pc.in diff --git a/include/sdl3game/SDL_GameControllerDB.h b/include/akgl/SDL_GameControllerDB.h similarity index 99% rename from include/sdl3game/SDL_GameControllerDB.h rename to include/akgl/SDL_GameControllerDB.h index 7b511a2..cf3fcf9 100644 --- a/include/sdl3game/SDL_GameControllerDB.h +++ b/include/akgl/SDL_GameControllerDB.h @@ -1,7 +1,7 @@ #ifndef _SDL_GAMECONTROLLERDB_H_ #define _SDL_GAMECONTROLLERDB_H_ -// Taken from https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/refs/heads/master/gamecontrollerdb.txt on Thu May 7 10:00:08 PM EDT 2026 +// Taken from https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/refs/heads/master/gamecontrollerdb.txt on Thu May 7 10:19:07 PM EDT 2026 #define AKGL_SDL_GAMECONTROLLER_DB_LEN 2225 diff --git a/include/sdl3game/actor.h b/include/akgl/actor.h similarity index 100% rename from include/sdl3game/actor.h rename to include/akgl/actor.h diff --git a/include/sdl3game/assets.h b/include/akgl/assets.h similarity index 100% rename from include/sdl3game/assets.h rename to include/akgl/assets.h diff --git a/include/sdl3game/character.h b/include/akgl/character.h similarity index 100% rename from include/sdl3game/character.h rename to include/akgl/character.h diff --git a/include/sdl3game/controller.h b/include/akgl/controller.h similarity index 100% rename from include/sdl3game/controller.h rename to include/akgl/controller.h diff --git a/include/sdl3game/draw.h b/include/akgl/draw.h similarity index 100% rename from include/sdl3game/draw.h rename to include/akgl/draw.h diff --git a/include/sdl3game/error.h b/include/akgl/error.h similarity index 100% rename from include/sdl3game/error.h rename to include/akgl/error.h diff --git a/include/sdl3game/game.h b/include/akgl/game.h similarity index 100% rename from include/sdl3game/game.h rename to include/akgl/game.h diff --git a/include/sdl3game/heap.h b/include/akgl/heap.h similarity index 100% rename from include/sdl3game/heap.h rename to include/akgl/heap.h diff --git a/include/sdl3game/iterator.h b/include/akgl/iterator.h similarity index 100% rename from include/sdl3game/iterator.h rename to include/akgl/iterator.h diff --git a/include/sdl3game/json_helpers.h b/include/akgl/json_helpers.h similarity index 100% rename from include/sdl3game/json_helpers.h rename to include/akgl/json_helpers.h diff --git a/include/sdl3game/registry.h b/include/akgl/registry.h similarity index 100% rename from include/sdl3game/registry.h rename to include/akgl/registry.h diff --git a/include/sdl3game/sprite.h b/include/akgl/sprite.h similarity index 100% rename from include/sdl3game/sprite.h rename to include/akgl/sprite.h diff --git a/include/sdl3game/staticstring.h b/include/akgl/staticstring.h similarity index 100% rename from include/sdl3game/staticstring.h rename to include/akgl/staticstring.h diff --git a/include/sdl3game/text.h b/include/akgl/text.h similarity index 100% rename from include/sdl3game/text.h rename to include/akgl/text.h diff --git a/include/sdl3game/tilemap.h b/include/akgl/tilemap.h similarity index 100% rename from include/sdl3game/tilemap.h rename to include/akgl/tilemap.h diff --git a/include/sdl3game/util.h b/include/akgl/util.h similarity index 100% rename from include/sdl3game/util.h rename to include/akgl/util.h diff --git a/mkcontrollermappings.sh b/mkcontrollermappings.sh index df74dd3..a52f39e 100755 --- a/mkcontrollermappings.sh +++ b/mkcontrollermappings.sh @@ -4,7 +4,7 @@ curl https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/refs/heads/ma filelen=$(wc -l mappings.txt | cut -d ' ' -f 1) -cat > ../include/sdl3game/SDL_GameControllerDB.h < ../include/akgl/SDL_GameControllerDB.h <> ../include/sdl3game/SDL_GameControllerDB.h; + printf ",\n" >> ../include/akgl/SDL_GameControllerDB.h; fi - printf " \"${LINE}\"" >> ../include/sdl3game/SDL_GameControllerDB.h; + printf " \"${LINE}\"" >> ../include/akgl/SDL_GameControllerDB.h; counter=$((counter + 1)) done -printf "\n};\n" >> ../include/sdl3game/SDL_GameControllerDB.h -printf "#endif // _SDL_GAMECONTROLLERDB_H_\n" >> ../include/sdl3game/SDL_GameControllerDB.h +printf "\n};\n" >> ../include/akgl/SDL_GameControllerDB.h +printf "#endif // _SDL_GAMECONTROLLERDB_H_\n" >> ../include/akgl/SDL_GameControllerDB.h diff --git a/rebuild.sh b/rebuild.sh old mode 100755 new mode 100644 index 1c9b59e..a7af24c --- a/rebuild.sh +++ b/rebuild.sh @@ -5,7 +5,7 @@ export CMAKE_PREFIX_PATH=/home/andrew/local:/home/andrew/local/lib/cmake export CMAKE_MODULE_PATH=/home/andrew/local/lib/cmake #export SDL3_DIR=/home/andrew/local -rm -fr ~/local/lib/*sdl3game* ~/local/include/sdl3game build +rm -fr ~/local/lib/*akgl* ~/local/include/akgl build cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo cmake --build build --parallel 4 cmake --install build --prefix /home/andrew/local diff --git a/src/actor.c b/src/actor.c index 4fdd816..0d1ac9f 100644 --- a/src/actor.c +++ b/src/actor.c @@ -3,13 +3,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include akerr_ErrorContext *akgl_actor_initialize(akgl_Actor *obj, char *name) { diff --git a/src/assets.c b/src/assets.c index bc90c2b..05e4d60 100644 --- a/src/assets.c +++ b/src/assets.c @@ -2,10 +2,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include akerr_ErrorContext *akgl_load_start_bgm(char *fname) { diff --git a/src/character.c b/src/character.c index ab12781..34d95a2 100644 --- a/src/character.c +++ b/src/character.c @@ -4,14 +4,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include akerr_ErrorContext *akgl_character_initialize(akgl_Character *obj, char *name) { diff --git a/src/controller.c b/src/controller.c index b40362a..733f010 100644 --- a/src/controller.c +++ b/src/controller.c @@ -1,9 +1,9 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include akgl_ControlMap GAME_ControlMaps[AKGL_MAX_CONTROL_MAPS]; diff --git a/src/draw.c b/src/draw.c index 1380644..3338b2b 100644 --- a/src/draw.c +++ b/src/draw.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include /* Draw a Gimpish background pattern to show transparency in the image */ void akgl_draw_background(int w, int h) diff --git a/src/game.c b/src/game.c index 053c0ea..267ea6b 100644 --- a/src/game.c +++ b/src/game.c @@ -5,15 +5,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include SDL_Window *window = NULL; SDL_Renderer *renderer = NULL; diff --git a/src/heap.c b/src/heap.c index 6aa9646..c469a8c 100644 --- a/src/heap.c +++ b/src/heap.c @@ -1,13 +1,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include akgl_Actor HEAP_ACTOR[AKGL_MAX_HEAP_ACTOR]; akgl_Sprite HEAP_SPRITE[AKGL_MAX_HEAP_SPRITE]; diff --git a/src/json_helpers.c b/src/json_helpers.c index 0ad5b7a..9ad9308 100644 --- a/src/json_helpers.c +++ b/src/json_helpers.c @@ -2,11 +2,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include akerr_ErrorContext *akgl_get_json_object_value(json_t *obj, char *key, json_t **dest) { diff --git a/src/registry.c b/src/registry.c index 799ebdf..7f2199f 100644 --- a/src/registry.c +++ b/src/registry.c @@ -1,10 +1,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include SDL_PropertiesID AKGL_REGISTRY_ACTOR; SDL_PropertiesID AKGL_AKGL_REGISTRY_ACTOR_STATE_STRINGS; diff --git a/src/sprite.c b/src/sprite.c index 4e27685..a3167b6 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -5,13 +5,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include static akerr_ErrorContext *akgl_sprite_load_json_spritesheet(json_t *json, akgl_SpriteSheet **sheet, char *relative_path) { diff --git a/src/staticstring.c b/src/staticstring.c index fe2017b..0d3afc0 100644 --- a/src/staticstring.c +++ b/src/staticstring.c @@ -1,5 +1,5 @@ #include -#include +#include akerr_ErrorContext *akgl_string_initialize(akgl_String *obj, char *init) { diff --git a/src/text.c b/src/text.c index 2e9e8aa..29bc8c4 100644 --- a/src/text.c +++ b/src/text.c @@ -1,9 +1,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include akerr_ErrorContext AKERR_NOIGNORE *akgl_text_loadfont(char *name, char *filepath, int size) { diff --git a/src/tilemap.c b/src/tilemap.c index 00644e5..842be1a 100644 --- a/src/tilemap.c +++ b/src/tilemap.c @@ -5,13 +5,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include akerr_ErrorContext *akgl_get_json_tilemap_property(json_t *obj, char *key, char *type, json_t **dest) { diff --git a/src/util.c b/src/util.c index 7183999..1c75a25 100644 --- a/src/util.c +++ b/src/util.c @@ -5,10 +5,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include akerr_ErrorContext *akgl_rectangle_points(RectanglePoints *dest, SDL_FRect *rect) { diff --git a/tests/actor.c b/tests/actor.c index fa135fd..46307e3 100644 --- a/tests/actor.c +++ b/tests/actor.c @@ -9,10 +9,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include int UNHANDLED_ERROR_BEHAVIOR; akerr_ErrorContext *unhandled_error_context; diff --git a/tests/bitmasks.c b/tests/bitmasks.c index ad127da..92a95a2 100644 --- a/tests/bitmasks.c +++ b/tests/bitmasks.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include int main(void) { diff --git a/tests/character.c b/tests/character.c index 19da2de..97312f8 100644 --- a/tests/character.c +++ b/tests/character.c @@ -1,12 +1,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include SDL_Window *window; SDL_Renderer *renderer; @@ -199,7 +199,7 @@ int main(void) FAIL_BREAK(errctx, AKGL_ERR_SDL, "Couldn't initialize SDL: %s", SDL_GetError()); } - if (!SDL_CreateWindowAndRenderer("net/aklabs/libsdl3game/test_character", 640, 480, SDL_WINDOW_HIDDEN, &window, &renderer)) { + if (!SDL_CreateWindowAndRenderer("net/aklabs/libakgl/test_character", 640, 480, SDL_WINDOW_HIDDEN, &window, &renderer)) { FAIL_BREAK(errctx, AKGL_ERR_SDL, "Couldn't create window/renderer: %s", SDL_GetError()); } diff --git a/tests/charviewer.c b/tests/charviewer.c index b767a6b..02504a8 100644 --- a/tests/charviewer.c +++ b/tests/charviewer.c @@ -5,17 +5,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include int numsprites = 8; char *spritepaths[] = { @@ -43,7 +43,7 @@ int main(void) FAIL_BREAK(errctx, AKGL_ERR_SDL, "Couldn't initialize SDL: %s", SDL_GetError()); } - if (!SDL_CreateWindowAndRenderer("net/aklabs/libsdl3game/test_sprite", 640, 480, 0, &window, &renderer)) { + if (!SDL_CreateWindowAndRenderer("net/aklabs/libakgl/test_sprite", 640, 480, 0, &window, &renderer)) { FAIL_BREAK(errctx, AKGL_ERR_SDL, "Couldn't create window/renderer: %s", SDL_GetError()); } @@ -52,7 +52,7 @@ int main(void) strcpy((char *)&game.name, "charviewer"); strcpy((char *)&game.version, "0.0.1"); - strcpy((char *)&game.uri, "net.aklabs.libsdl3game.charviewer"); + strcpy((char *)&game.uri, "net.aklabs.libakgl.charviewer"); game.screenwidth = 640; game.screenheight = 480; diff --git a/tests/registry.c b/tests/registry.c index 41f9292..9b0d8bf 100644 --- a/tests/registry.c +++ b/tests/registry.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include typedef akerr_ErrorContext *(*RegistryFuncPtr)(void); diff --git a/tests/sprite.c b/tests/sprite.c index 2ba3dae..835f717 100644 --- a/tests/sprite.c +++ b/tests/sprite.c @@ -5,11 +5,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include SDL_Window *window; SDL_Renderer *renderer; @@ -194,7 +194,7 @@ int main(void) FAIL_BREAK(errctx, AKGL_ERR_SDL, "Couldn't initialize SDL: %s", SDL_GetError()); } - if (!SDL_CreateWindowAndRenderer("net/aklabs/libsdl3game/test_sprite", 640, 480, 0, &window, &renderer)) { + if (!SDL_CreateWindowAndRenderer("net/aklabs/libakgl/test_sprite", 640, 480, 0, &window, &renderer)) { FAIL_BREAK(errctx, AKGL_ERR_SDL, "Couldn't create window/renderer: %s", SDL_GetError()); } diff --git a/tests/staticstring.c b/tests/staticstring.c index 12293b7..0d1d43a 100644 --- a/tests/staticstring.c +++ b/tests/staticstring.c @@ -1,7 +1,7 @@ #include #include -#include -#include +#include +#include void reset_string_heap(void); diff --git a/tests/tilemap.c b/tests/tilemap.c index 0b8d039..696df1a 100644 --- a/tests/tilemap.c +++ b/tests/tilemap.c @@ -3,13 +3,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include akerr_ErrorContext *test_tilemap_akgl_get_json_tilemap_property(void) { @@ -398,7 +398,7 @@ int main(void) FAIL_BREAK(errctx, AKGL_ERR_SDL, "Couldn't initialize SDL: %s", SDL_GetError()); } - if (!SDL_CreateWindowAndRenderer("net/aklabs/libsdl3game/test_sprite", 768, 576, 0, &window, &renderer)) { + if (!SDL_CreateWindowAndRenderer("net/aklabs/libakgl/test_sprite", 768, 576, 0, &window, &renderer)) { FAIL_BREAK(errctx, AKGL_ERR_SDL, "Couldn't create window/renderer: %s", SDL_GetError()); } diff --git a/tests/util.c b/tests/util.c index 532bd3c..175930e 100644 --- a/tests/util.c +++ b/tests/util.c @@ -1,6 +1,6 @@ #include #include -#include +#include akerr_ErrorContext *test_akgl_rectangle_points_nullpointers(void) { diff --git a/util/charviewer.c b/util/charviewer.c index ab07f11..6f37814 100644 --- a/util/charviewer.c +++ b/util/charviewer.c @@ -6,17 +6,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -47,7 +47,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[]) strcpy((char *)&game.name, "charviewer"); strcpy((char *)&game.version, "0.0.1"); - strcpy((char *)&game.uri, "net.aklabs.libsdl3game.charviewer"); + strcpy((char *)&game.uri, "net.aklabs.libakgl.charviewer"); game.screenwidth = 640; game.screenheight = 480; @@ -147,7 +147,7 @@ SDL_AppResult SDL_AppIterate(void *appstate) AKGL_BITMASK_ADD(opflags.flags, AKGL_ITERATOR_OP_RENDER); akgl_draw_background(game.screenwidth, game.screenheight); ATTEMPT { - CATCH(errctx, akgl_tilemap_draw(renderer, (tilemap *)&gamemap, &camera, i)); + CATCH(errctx, akgl_tilemap_draw(renderer, (akgl_Tilemap *)&gamemap, &camera, i)); SDL_EnumerateProperties(AKGL_REGISTRY_ACTOR, &akgl_registry_iterate_actor, (void *)&opflags); } CLEANUP { } PROCESS(errctx) {