diff --git a/.gitignore b/.gitignore index b1c3cdf..23bbbb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libs/glad/glad.o /opengl +/game/main diff --git a/game/Makefile b/game/Makefile index 2ca327b..84dd10d 100644 --- a/game/Makefile +++ b/game/Makefile @@ -1,5 +1,5 @@ -P=tenchu -OBJECTS=-l:libcglm.so +P=main +OBJECTS=libs/glad/glad.o CFLAGS=-g -Wall -Wextra -O0 LDLIBS=-lglfw -lOpenGL -lm INCLUDES=-Ilibs/glad/include/ -Ilibs/ @@ -8,7 +8,7 @@ RM=rm -vf .PHONY: build build: clean - $(CC) $(CFLAGS) $(LDLIBS) $(INCLUDES) libs/glad/glad.o tenchu.c -o $(P) + $(CC) $(CFLAGS) $(LDLIBS) $(INCLUDES) $(OBJECTS) $(P).c -o $(P) .PHONY: run run: build diff --git a/game/tenchu.c b/game/main.c similarity index 100% rename from game/tenchu.c rename to game/main.c diff --git a/game/tools/texturepacker.c b/game/tools/texturepacker.c new file mode 100644 index 0000000..da03a5e --- /dev/null +++ b/game/tools/texturepacker.c @@ -0,0 +1,13 @@ +#include +#include +#include + +#define STB_IMAGE_IMPLEMENTATION +#include "stb_image.h" + +int main(void) { + + + + return 0; +}