aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorClyne Sullivan <clyne@bitgloo.com>2022-08-19 20:52:59 -0400
committerClyne Sullivan <clyne@bitgloo.com>2022-08-19 20:52:59 -0400
commitbdc0e843a4762a1abddebc53d12a351debe8d457 (patch)
treead4c2023c5c03527b628108f2c76bf42c354724c /Makefile
parentd1dd9743d93009eef7d32d5403eeefbba29c2ee6 (diff)
add cereal and entityx submodules; fix compile errors
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 10 insertions, 5 deletions
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)))