From: outfrost <kotlet.bahn@gmail.com>
Date: Wed, 19 Feb 2020 20:29:42 +0000 (+0000)
Subject: Fix includes and build instructions
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=1893fe5b901f5ed50039b27f1c97d03d1ff21d28;p=shadowclad.git

Fix includes and build instructions
---

diff --git a/Makefile b/Makefile
index e6e297c..28a06f2 100644
--- 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 56b0a9f..8cc9c49 100644
--- 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 a16061a..21275dd 100644
--- 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 967c78e..2f2d8db 100644
--- 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 4e12613..32e0076 100644
--- 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 4b0317c..eeae33b 100644
--- 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 a7f0c62..144f54a 100644
--- 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);