From bdc0e843a4762a1abddebc53d12a351debe8d457 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Fri, 19 Aug 2022 20:52:59 -0400
Subject: add cereal and entityx submodules; fix compile errors

---
 Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 357d7ff..23f522e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,11 +40,16 @@ LIBS   = -L$(LIBDIR) -lSDL2 -lpthread -lentityx -lluajit -ldl -lGLEW -lGL \
 		 -lSDL2_image -lSOIL -lfreetype -lopenal -lalut
 
 CXXFLAGS = -ggdb -std=c++17 -Wall -Wextra -Werror -pedantic \
-		   -Wno-class-memaccess -Wno-implicit-fallthrough -m64
-
-CXXINCS = -Isrc -I$(LIBDIR)/LuaJIT/src -I$(LIBDIR)/entityx \
-		  -I$(LIBDIR)/LuaBridge/Source -I$(LIBDIR)/sol2/include \
-		  -I$(LIBDIR)/soil -I$(LIBDIR)/cereal/include -I$(LIBDIR)/freetype
+		   -Wno-class-memaccess -Wno-implicit-fallthrough -Wno-unused-parameter
+
+CXXINCS = -I$(SRCDIR) \
+          -I$(LIBDIR)/entityx \
+          -I$(LIBDIR)/LuaJIT/src \
+          -I$(LIBDIR)/LuaBridge/Source \
+          -I$(LIBDIR)/sol2/include \
+          -I$(LIBDIR)/soil \
+          -I$(LIBDIR)/cereal/include \
+	  -I$(LIBDIR)/freetype
 
 CXXSRC := $(shell find $(SRCDIR) -type f -name *.$(SRCEXT))
 CXXOBJ := $(patsubst $(SRCDIR)/%,$(OUTDIR)/%,$(CXXSRC:.$(SRCEXT)=.$(OBJEXT)))
-- 
cgit v1.2.3