From da9afb7e5b0bb8f0d8be43ba3d8db7b2b5f21e0f Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 14 Nov 2022 09:27:32 +0000 Subject: [PATCH] Small adjustments to appease the android build --- assets/sprites/little_plane.png | Bin 0 -> 14552 bytes core/engine.c | 4 ++-- core/engine_node.c | 2 -- core/lib_engine.c | 2 +- core/makefile | 2 +- makefile | 21 +++++++++++++++++++++ source/main.c | 3 +++ source/makefile | 2 +- 8 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 assets/sprites/little_plane.png diff --git a/assets/sprites/little_plane.png b/assets/sprites/little_plane.png new file mode 100644 index 0000000000000000000000000000000000000000..1c8153c7d287fa79172538912d2a7e3a03656b09 GIT binary patch literal 14552 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 literal 0 HcmV?d00001 diff --git a/core/engine.c b/core/engine.c index 183ff38..f7a6ccc 100644 --- a/core/engine.c +++ b/core/engine.c @@ -25,7 +25,7 @@ Engine engine; //errors here should be fatal static void fatalError(char* message) { - fprintf(stderr, message); + fprintf(stderr, "%s", message); exit(-1); } @@ -38,7 +38,7 @@ void initEngine() { engine.renderer = NULL; //init SDL - if (SDL_Init(0) != 0) { + if (SDL_Init(SDL_INIT_VIDEO) != 0) { fatalError("Failed to initialize SDL2"); } diff --git a/core/engine_node.c b/core/engine_node.c index ef462d7..af58953 100644 --- a/core/engine_node.c +++ b/core/engine_node.c @@ -4,8 +4,6 @@ #include "memory.h" -STATIC_ASSERT(sizeof(EngineNode) == 72); - static void freeMemory(void* ptr) { EngineNode* node = (EngineNode*)ptr; //SDL stuff diff --git a/core/lib_engine.c b/core/lib_engine.c index 89a7f1a..79047d2 100644 --- a/core/lib_engine.c +++ b/core/lib_engine.c @@ -8,7 +8,7 @@ //errors here should be fatal static void fatalError(char* message) { - fprintf(stderr, message); + fprintf(stderr, "%s", message); exit(-1); } diff --git a/core/makefile b/core/makefile index 713c9ce..838400f 100644 --- a/core/makefile +++ b/core/makefile @@ -1,7 +1,7 @@ CC=gcc IDIR+=. ../Toy/source -CFLAGS+=$(addprefix -I,$(IDIR)) -DSDL_MAIN_HANDLED -g -Wall -W -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable +CFLAGS+=$(addprefix -I,$(IDIR)) -g -Wall -W -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable LIBS+=-lSDL2 -lSDL2_image -ltoy ODIR = obj diff --git a/makefile b/makefile index bb8df21..376b607 100644 --- a/makefile +++ b/makefile @@ -55,3 +55,24 @@ else endif rebuild: clean all + + +#utils for the manual android build +INCLUDEDIR=include + +SOURCEDIR=bundle + +$(INCLUDEDIR): + mkdir $(INCLUDEDIR) + +$(SOURCEDIR): + mkdir $(SOURCEDIR) + +sourcelist: + @echo $(addprefix ../airport/,$(wildcard Toy/source/*.c) $(wildcard core/*.c) $(wildcard source/*.c)) > source.list + +bundleincludes: $(INCLUDEDIR) + cp $(addprefix ../airport/,$(wildcard Toy/source/*.h) $(wildcard core/*.h) $(wildcard source/*.h)) $(INCLUDEDIR) + +bundlesource: $(SOURCEDIR) + cp $(addprefix ../airport/,$(wildcard Toy/source/*.c) $(wildcard core/*.c) $(wildcard source/*.c)) $(SOURCEDIR) \ No newline at end of file diff --git a/source/main.c b/source/main.c index 0264f3f..c83c183 100644 --- a/source/main.c +++ b/source/main.c @@ -1,3 +1,6 @@ +//moved here for android shenanigans +#define SDL_MAIN_HANDLED + #include "engine.h" int main(int argc, char* argv[]) { diff --git a/source/makefile b/source/makefile index 0f6882d..2042533 100644 --- a/source/makefile +++ b/source/makefile @@ -1,7 +1,7 @@ CC=gcc IDIR+=. ../Toy/source ../core -CFLAGS+=$(addprefix -I,$(IDIR)) -DSDL_MAIN_HANDLED -g -Wall -W -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable +CFLAGS+=$(addprefix -I,$(IDIR)) -g -Wall -W -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable LIBS+=-lSDL2 -ltoy -lcore ODIR = obj