aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorAndy <drumsetmonkey@gmail.com>2017-01-19 09:21:12 -0500
committerAndy <drumsetmonkey@gmail.com>2017-01-19 09:21:12 -0500
commit213d9ccfbb4752d4c62d6b7e6b3f9172cdf1bccc (patch)
tree7872c6f30c8adf048a7863a33d837299c7fb0771 /Makefile
parent19a32074595a4a2797eaeb978f8bd302f736f6a6 (diff)
parent8452b199d28bea53bf2c5e3b3d604064000fc73d (diff)
Limb animation actually works
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 12 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 26adce1..471a11a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CXX = g++
ifeq ($(TARGET_OS),linux)
LIBS = -lpthread -lGL -lGLEW -lfreetype \
- -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2main -lentityx
+ -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2main
endif
ifeq ($(TARGET_OS),win32)
LIBS = -lopengl32 -lglew32 -lmingw32 \
@@ -13,7 +13,7 @@ ifeq ($(TARGET_OS),win32)
endif
CXXFLAGS = -ggdb -m$(TARGET_BITS) -std=c++14 -fext-numeric-literals
-CXXINC = -Iinclude -Iinclude/freetype
+CXXINC = -Iinclude -Iinclude/freetype -I.
CXXWARN = -Wall -Wextra -Werror -pedantic
CXXSRCDIR = src
@@ -39,6 +39,12 @@ cleandata:
touch brice.dat
$(EXEC): $(CXXOUTDIR)/$(CXXOBJ) main.cpp
+ g++ -I. -std=c++11 -c entityx/help/Pool.cc -o out/Pool.o
+ g++ -I. -std=c++11 -c entityx/help/Timer.cc -o out/Timer.o
+ g++ -I. -std=c++11 -c entityx/Event.cc -o out/Event.o
+ g++ -I. -std=c++11 -c entityx/Entity.cc -o out/Entity.o
+ g++ -I. -std=c++11 -c entityx/System.cc -o out/System.o
+
@echo " CXX/LD main"
@$(CXX) $(CXXFLAGS) $(CXXINC) $(CXXWARN) -o $(EXEC) main.cpp out/*.o $(LIBS)
@rm -rf xml/*.dat
@@ -47,3 +53,7 @@ $(EXEC): $(CXXOUTDIR)/$(CXXOBJ) main.cpp
$(CXXOUTDIR)/%.o: $(CXXSRCDIR)/%.cpp
@echo " CXX " $<
@$(CXX) $(CXXFLAGS) $(CXXINC) $(CXXWARN) $(LIBS) -c $< -o $@
+
+$(CXXOUTDIR)/%.o: $(CXXSRCDIR)/%.cc
+ @echo " CXX " $<
+ @$(CXX) $(CXXFLAGS) $(CXXINC) $(CXXWARN) $(LIBS) -c $< -o $@