diff --git a/Makefile b/Makefile index 2304ad7..395d84b 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,7 @@ INC_FLAGS := $(addprefix -I,$(INC_DIRS)) CPPFLAGS ?= $(INC_FLAGS) -Ilibtmx-parser/src -Ilibtmx-parser/libs/tinyxml2 -MMD -MP -w -I$(LIBXML_ROOT) -LINKER_FLAGS = -lSDL2 -lSDL2_image -lSDL2_mixer -lxml2 -ltmxparser - +LINKER_FLAGS = -lSDL2 -lSDL2_image -lSDL2_mixer -lxml2 libtmx-parser/libtmxparser.a $(BUILD_DIR)/$(TARGET_EXEC): $(OBJS) # $(CC) $(OBJS) -o $@ $(LDFLAGS) $(CXX) $(OBJS) $(LINKER_FLAGS) -o $@ @@ -38,6 +37,9 @@ $(BUILD_DIR)/%.cpp.o: %.cpp $(MKDIR_P) $(dir $@) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINKER_FLAGS) -c $< -o $@ +# build and archive static libraries +# libtmxparser.a: +# ar rcs libtmxparser.a .o .PHONY: clean diff --git a/build/BeagleRescue b/build/BeagleRescue index 1ba77f0..ea88bf4 100755 Binary files a/build/BeagleRescue and b/build/BeagleRescue differ diff --git a/src/game/Game.hpp b/src/game/Game.hpp index 1ef03af..2251c9f 100644 --- a/src/game/Game.hpp +++ b/src/game/Game.hpp @@ -16,7 +16,7 @@ #include "Vector2D.h" #include "../assetmgr/AssetManager.h" #include "GameStateManager.h" -#include "tmxparser.h" +#include "../../libtmx-parser/src/tmxparser.h" class ColliderComponent; class AssetManager;