diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..5f0b95d --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Box"] + path = Box + url = https://github.com/Ratstail91/Box.git diff --git a/Box b/Box new file mode 160000 index 0000000..63c7fde --- /dev/null +++ b/Box @@ -0,0 +1 @@ +Subproject commit 63c7fde56f18bf878931337e0f995feb53ea8f85 diff --git a/makefile b/makefile index 0c3763d..907da5b 100644 --- a/makefile +++ b/makefile @@ -4,6 +4,7 @@ export TOY_OUTDIR = ../../$(OUTDIR) all: $(OUTDIR) toy box $(MAKE) -j8 -C source + cp -r assets $(OUTDIR) toy: $(LIBDIR) $(MAKE) -j8 -C Box/Toy/source diff --git a/source/main.c b/source/main.c index bbd9ff3..81b78eb 100644 --- a/source/main.c +++ b/source/main.c @@ -1,6 +1,3 @@ -//moved here for android shenanigans -#define SDL_MAIN_HANDLED - #include "box_engine.h" #include "toy_drive_system.h" diff --git a/source/makefile b/source/makefile index 524120d..6d8b9fe 100644 --- a/source/makefile +++ b/source/makefile @@ -1,8 +1,8 @@ CC=gcc -IDIR+=. ../Toy/source ../box +IDIR+=. ../Box/Toy/source ../Box/source CFLAGS+=$(addprefix -I,$(IDIR)) -g -Wall -W -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable -LIBS+=-lSDL2 -ltoy -lbox +LIBS+=-lSDL2 -ltoy -lbox -lSDL2_image -lSDL2_ttf -lSDL2main -lSDL2 ODIR = obj SRC = $(wildcard *.c) @@ -11,7 +11,7 @@ OBJ = $(addprefix $(ODIR)/,$(SRC:.c=.o)) OUT=../$(OUTDIR)/airport all: $(OBJ) - $(CC) $(CFLAGS) -o $(OUT) $(OBJ) -Wl,-rpath,. -L../$(LIBDIR) $(LIBS) + $(CC) $(CFLAGS) -o $(OUT) $(OBJ) -Wl,-rpath,. -L../$(OUTDIR) $(LIBS) $(OBJ): | $(ODIR)