Fix includes and build instructions

diff --git a/Makefile b/Makefile
index e6e297c45412bec95c2613c438abce1a6e02a1fd..28a06f246d4c087d8b212f748cf736dc21663c9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ PLATFORM ?= x86_64-linux-gnu
 BUILDDIR ?= target/$(PLATFORM)
 SRCDIR ?= src
 
+CPPFLAGS ::= -iquotesrc/ $(CPPFLAGS)
 CFLAGS ::= -g -std=c99 -Wall -Wextra -Wpedantic $(CFLAGS)
 LDFLAGS ::= $(LDFLAGS)
 LDLIBS ::= -L/usr/local/lib -lGL -lGLEW -lglut -lassimp $(LDLIBS)
@@ -12,14 +13,14 @@ LDLIBS ::= -L/usr/local/lib -lGL -lGLEW -lglut -lassimp $(LDLIBS)
 # ######
 
 sources ::= main.c \
-            asset.c \
-            level.c \
-            logger.c \
-            performance.c \
-            player.c \
-            render.c \
-            tga.c \
-            ui.c
+            engine/asset.c \
+            engine/logger.c \
+            engine/performance.c \
+            engine/render.c \
+            engine/tga.c \
+            engine/ui.c \
+            game/level.c \
+            game/player.c
 
 srcfiles ::= $(addprefix $(SRCDIR)/, $(sources))
 

diff --git a/src/engine/render.c b/src/engine/render.c
index 56b0a9f732b05ee3b3586951dee8096dffe843a0..8cc9c49140fc52887b4d0acd5e6caab1f04a5350 100644 (file)
--- a/src/engine/render.c
+++ b/src/engine/render.c
@@ -1,9 +1,10 @@
 #include <GL/glut.h>
 #include <stdbool.h>
 
-#include "level.h"
+#include "game/level.h"
+#include "game/player.h"
+
 #include "performance.h"
-#include "player.h"
 #include "typedefs.h"
 
 const float AXIS_RADIUS = 5.0f;

diff --git a/src/game/level.c b/src/game/level.c
index a16061ab0b3e4167a14569366499f8ace8f2c6be..21275dd797cbd40e8e7a664fed17c5b748398cdf 100644 (file)
--- a/src/game/level.c
+++ b/src/game/level.c
@@ -1,8 +1,9 @@
 #include <GL/gl.h>
 #include <stdlib.h>
 
+#include "engine/logger.h"
+
 #include "level.h"
-#include "logger.h"
 #include "player.h"
 
 static Block blockEmpty = { .type = BLOCKTYPE_SPACE,

diff --git a/src/game/level.h b/src/game/level.h
index 967c78e4095137c15e6392474eaff9c64be66206..2f2d8db4466ab02b1dc698c119fd256069bd5a8c 100644 (file)
--- a/src/game/level.h
+++ b/src/game/level.h
@@ -3,8 +3,8 @@
 
 #include <stdint.h>
 
-#include "asset.h"
-#include "tga.h"
+#include "engine/asset.h"
+#include "engine/tga.h"
 
 typedef enum {
        BLOCKTYPE_SPACE,

diff --git a/src/game/player.c b/src/game/player.c
index 4e12613f1948a9c41e08398bd2dceaff33ce3250..32e0076f7ce756cd0b6f336edc18f3bb396e6a35 100644 (file)
--- a/src/game/player.c
+++ b/src/game/player.c
@@ -1,5 +1,6 @@
+#include "engine/logger.h"
+
 #include "level.h"
-#include "logger.h"
 #include "player.h"
 
 Character playerCharacter = { .asset3D = NULL };

diff --git a/src/game/player.h b/src/game/player.h
index 4b0317cc82de4d08d21a87891ebe98b3cb960ea6..eeae33b3fdd917167843bb5cd3d3b0c6a4f80244 100644 (file)
--- a/src/game/player.h
+++ b/src/game/player.h
@@ -3,7 +3,7 @@
 
 #include <GL/gl.h>
 
-#include "asset.h"
+#include "engine/asset.h"
 
 typedef struct {
        const Asset3D* asset3D;

diff --git a/src/main.c b/src/main.c
index a7f0c62375b9cb55527b435a83dc68087b42f1d7..144f54af24ae706618d8cc953587160d40590f07 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,12 +1,13 @@
 #include <GL/glxew.h>
 #include <GL/glut.h>
 
-#include "level.h"
-#include "logger.h"
-#include "performance.h"
-#include "player.h"
-#include "render.h"
-#include "ui.h"
+#include "engine/logger.h"
+#include "engine/performance.h"
+#include "engine/render.h"
+#include "engine/ui.h"
+
+#include "game/level.h"
+#include "game/player.h"
 
 int main(int argc, char** argv) {
        glutInit(&argc, argv);