From e74cc6bf94334bfab84fa5bfecc9bfdb42e33f6d Mon Sep 17 00:00:00 2001 From: veclavtalica Date: Tue, 30 Jul 2024 22:31:18 +0300 Subject: [PATCH] remove symlink as windows is shit, src to townengine --- CMakeLists.txt | 24 +++++++++---------- apps/testgame/scenes/ingame.c | 1 - townengine | 1 - {src => townengine}/audio.c | 0 {src => townengine}/audio.h | 0 {src => townengine}/audio/internal_api.h | 0 {src => townengine}/camera.c | 0 {src => townengine}/camera.h | 0 {src => townengine}/config.h | 0 {src => townengine}/context.c | 0 {src => townengine}/context.h | 0 {src => townengine}/game_api.h | 1 + {src => townengine}/input.c | 0 {src => townengine}/input.h | 2 +- {src => townengine}/macros/concatenate.h | 0 {src => townengine}/macros/option.h | 0 {src => townengine}/macros/varargcount.h | 0 {src => townengine}/main.c | 0 {src => townengine}/procgen.h | 0 {src => townengine}/procgen/perlin.h | 0 {src => townengine}/procgen/perlin2d.c | 0 {src => townengine}/rendering.c | 0 {src => townengine}/rendering.h | 0 {src => townengine}/rendering/circles.h | 0 {src => townengine}/rendering/internal_api.h | 0 .../rendering/quad_element_buffer.h | 0 {src => townengine}/rendering/sprites.h | 0 {src => townengine}/rendering/triangles.h | 0 {src => townengine}/scripting.c | 0 {src => townengine}/scripting.h | 0 {src => townengine}/system/linux/elf.c | 0 {src => townengine}/system/linux/elf.h | 0 {src => townengine}/text.c | 0 {src => townengine}/text.h | 0 {src => townengine}/textures/internal_api.h | 0 {src => townengine}/textures/modes.h | 0 {src => townengine}/textures/textures.c | 0 {src => townengine}/util.c | 0 {src => townengine}/util.h | 0 {src => townengine}/vec.h | 0 40 files changed, 14 insertions(+), 15 deletions(-) delete mode 120000 townengine rename {src => townengine}/audio.c (100%) rename {src => townengine}/audio.h (100%) rename {src => townengine}/audio/internal_api.h (100%) rename {src => townengine}/camera.c (100%) rename {src => townengine}/camera.h (100%) rename {src => townengine}/config.h (100%) rename {src => townengine}/context.c (100%) rename {src => townengine}/context.h (100%) rename {src => townengine}/game_api.h (94%) rename {src => townengine}/input.c (100%) rename {src => townengine}/input.h (99%) rename {src => townengine}/macros/concatenate.h (100%) rename {src => townengine}/macros/option.h (100%) rename {src => townengine}/macros/varargcount.h (100%) rename {src => townengine}/main.c (100%) rename {src => townengine}/procgen.h (100%) rename {src => townengine}/procgen/perlin.h (100%) rename {src => townengine}/procgen/perlin2d.c (100%) rename {src => townengine}/rendering.c (100%) rename {src => townengine}/rendering.h (100%) rename {src => townengine}/rendering/circles.h (100%) rename {src => townengine}/rendering/internal_api.h (100%) rename {src => townengine}/rendering/quad_element_buffer.h (100%) rename {src => townengine}/rendering/sprites.h (100%) rename {src => townengine}/rendering/triangles.h (100%) rename {src => townengine}/scripting.c (100%) rename {src => townengine}/scripting.h (100%) rename {src => townengine}/system/linux/elf.c (100%) rename {src => townengine}/system/linux/elf.h (100%) rename {src => townengine}/text.c (100%) rename {src => townengine}/text.h (100%) rename {src => townengine}/textures/internal_api.h (100%) rename {src => townengine}/textures/modes.h (100%) rename {src => townengine}/textures/textures.c (100%) rename {src => townengine}/util.c (100%) rename {src => townengine}/util.h (100%) rename {src => townengine}/vec.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c33f7f..242969d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ add_subdirectory(third-party/libxm) if(UNIX) set(SYSTEM_SOURCE_FILES - src/system/linux/elf.c + townengine/system/linux/elf.c ) else() set(SYSTEM_SOURCE_FILES) @@ -38,17 +38,17 @@ set(TOWNENGINE_SOURCE_FILES third-party/stb/stb_vorbis.c third-party/glad/src/glad.c - src/main.c - src/config.h - src/context.c src/context.h - src/audio.c src/audio.h - src/util.c src/util.h - src/rendering.c src/rendering.h - src/input.c src/input.h - src/text.c src/text.h - src/camera.c src/camera.h - src/textures/textures.c - src/procgen/perlin2d.c + townengine/main.c + townengine/config.h + townengine/context.c townengine/context.h + townengine/audio.c townengine/audio.h + townengine/util.c townengine/util.h + townengine/rendering.c townengine/rendering.h + townengine/input.c townengine/input.h + townengine/text.c townengine/text.h + townengine/camera.c townengine/camera.h + townengine/textures/textures.c + townengine/procgen/perlin2d.c ${SYSTEM_SOURCE_FILES} ) diff --git a/apps/testgame/scenes/ingame.c b/apps/testgame/scenes/ingame.c index 37fc972..6c69f96 100644 --- a/apps/testgame/scenes/ingame.c +++ b/apps/testgame/scenes/ingame.c @@ -1,5 +1,4 @@ #include "ingame.h" -#include "src/input.h" #include "title.h" #include "scene.h" diff --git a/townengine b/townengine deleted file mode 120000 index e831038..0000000 --- a/townengine +++ /dev/null @@ -1 +0,0 @@ -src \ No newline at end of file diff --git a/src/audio.c b/townengine/audio.c similarity index 100% rename from src/audio.c rename to townengine/audio.c diff --git a/src/audio.h b/townengine/audio.h similarity index 100% rename from src/audio.h rename to townengine/audio.h diff --git a/src/audio/internal_api.h b/townengine/audio/internal_api.h similarity index 100% rename from src/audio/internal_api.h rename to townengine/audio/internal_api.h diff --git a/src/camera.c b/townengine/camera.c similarity index 100% rename from src/camera.c rename to townengine/camera.c diff --git a/src/camera.h b/townengine/camera.h similarity index 100% rename from src/camera.h rename to townengine/camera.h diff --git a/src/config.h b/townengine/config.h similarity index 100% rename from src/config.h rename to townengine/config.h diff --git a/src/context.c b/townengine/context.c similarity index 100% rename from src/context.c rename to townengine/context.c diff --git a/src/context.h b/townengine/context.h similarity index 100% rename from src/context.h rename to townengine/context.h diff --git a/src/game_api.h b/townengine/game_api.h similarity index 94% rename from src/game_api.h rename to townengine/game_api.h index 9b4c55d..94a4af9 100644 --- a/src/game_api.h +++ b/townengine/game_api.h @@ -8,6 +8,7 @@ #include "audio.h" #include "util.h" #include "procgen.h" +#include "input.h" /* application provided */ extern void game_tick(void); diff --git a/src/input.c b/townengine/input.c similarity index 100% rename from src/input.c rename to townengine/input.c diff --git a/src/input.h b/townengine/input.h similarity index 99% rename from src/input.h rename to townengine/input.h index cedf0de..2f1c489 100644 --- a/src/input.h +++ b/townengine/input.h @@ -2,7 +2,7 @@ #define INPUT_H #include "config.h" -#include "src/vec.h" +#include "vec.h" #include "util.h" #include diff --git a/src/macros/concatenate.h b/townengine/macros/concatenate.h similarity index 100% rename from src/macros/concatenate.h rename to townengine/macros/concatenate.h diff --git a/src/macros/option.h b/townengine/macros/option.h similarity index 100% rename from src/macros/option.h rename to townengine/macros/option.h diff --git a/src/macros/varargcount.h b/townengine/macros/varargcount.h similarity index 100% rename from src/macros/varargcount.h rename to townengine/macros/varargcount.h diff --git a/src/main.c b/townengine/main.c similarity index 100% rename from src/main.c rename to townengine/main.c diff --git a/src/procgen.h b/townengine/procgen.h similarity index 100% rename from src/procgen.h rename to townengine/procgen.h diff --git a/src/procgen/perlin.h b/townengine/procgen/perlin.h similarity index 100% rename from src/procgen/perlin.h rename to townengine/procgen/perlin.h diff --git a/src/procgen/perlin2d.c b/townengine/procgen/perlin2d.c similarity index 100% rename from src/procgen/perlin2d.c rename to townengine/procgen/perlin2d.c diff --git a/src/rendering.c b/townengine/rendering.c similarity index 100% rename from src/rendering.c rename to townengine/rendering.c diff --git a/src/rendering.h b/townengine/rendering.h similarity index 100% rename from src/rendering.h rename to townengine/rendering.h diff --git a/src/rendering/circles.h b/townengine/rendering/circles.h similarity index 100% rename from src/rendering/circles.h rename to townengine/rendering/circles.h diff --git a/src/rendering/internal_api.h b/townengine/rendering/internal_api.h similarity index 100% rename from src/rendering/internal_api.h rename to townengine/rendering/internal_api.h diff --git a/src/rendering/quad_element_buffer.h b/townengine/rendering/quad_element_buffer.h similarity index 100% rename from src/rendering/quad_element_buffer.h rename to townengine/rendering/quad_element_buffer.h diff --git a/src/rendering/sprites.h b/townengine/rendering/sprites.h similarity index 100% rename from src/rendering/sprites.h rename to townengine/rendering/sprites.h diff --git a/src/rendering/triangles.h b/townengine/rendering/triangles.h similarity index 100% rename from src/rendering/triangles.h rename to townengine/rendering/triangles.h diff --git a/src/scripting.c b/townengine/scripting.c similarity index 100% rename from src/scripting.c rename to townengine/scripting.c diff --git a/src/scripting.h b/townengine/scripting.h similarity index 100% rename from src/scripting.h rename to townengine/scripting.h diff --git a/src/system/linux/elf.c b/townengine/system/linux/elf.c similarity index 100% rename from src/system/linux/elf.c rename to townengine/system/linux/elf.c diff --git a/src/system/linux/elf.h b/townengine/system/linux/elf.h similarity index 100% rename from src/system/linux/elf.h rename to townengine/system/linux/elf.h diff --git a/src/text.c b/townengine/text.c similarity index 100% rename from src/text.c rename to townengine/text.c diff --git a/src/text.h b/townengine/text.h similarity index 100% rename from src/text.h rename to townengine/text.h diff --git a/src/textures/internal_api.h b/townengine/textures/internal_api.h similarity index 100% rename from src/textures/internal_api.h rename to townengine/textures/internal_api.h diff --git a/src/textures/modes.h b/townengine/textures/modes.h similarity index 100% rename from src/textures/modes.h rename to townengine/textures/modes.h diff --git a/src/textures/textures.c b/townengine/textures/textures.c similarity index 100% rename from src/textures/textures.c rename to townengine/textures/textures.c diff --git a/src/util.c b/townengine/util.c similarity index 100% rename from src/util.c rename to townengine/util.c diff --git a/src/util.h b/townengine/util.h similarity index 100% rename from src/util.h rename to townengine/util.h diff --git a/src/vec.h b/townengine/vec.h similarity index 100% rename from src/vec.h rename to townengine/vec.h