Changed to static libraries for libTmxParser
This commit is contained in:
parent
21c30b7f52
commit
e2605bf6c1
6
Makefile
6
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)
|
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)
|
$(BUILD_DIR)/$(TARGET_EXEC): $(OBJS)
|
||||||
# $(CC) $(OBJS) -o $@ $(LDFLAGS)
|
# $(CC) $(OBJS) -o $@ $(LDFLAGS)
|
||||||
$(CXX) $(OBJS) $(LINKER_FLAGS) -o $@
|
$(CXX) $(OBJS) $(LINKER_FLAGS) -o $@
|
||||||
@ -38,6 +37,9 @@ $(BUILD_DIR)/%.cpp.o: %.cpp
|
|||||||
$(MKDIR_P) $(dir $@)
|
$(MKDIR_P) $(dir $@)
|
||||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINKER_FLAGS) -c $< -o $@
|
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LINKER_FLAGS) -c $< -o $@
|
||||||
|
|
||||||
|
# build and archive static libraries
|
||||||
|
# libtmxparser.a:
|
||||||
|
# ar rcs libtmxparser.a .o
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
|
|
||||||
|
Binary file not shown.
@ -16,7 +16,7 @@
|
|||||||
#include "Vector2D.h"
|
#include "Vector2D.h"
|
||||||
#include "../assetmgr/AssetManager.h"
|
#include "../assetmgr/AssetManager.h"
|
||||||
#include "GameStateManager.h"
|
#include "GameStateManager.h"
|
||||||
#include "tmxparser.h"
|
#include "../../libtmx-parser/src/tmxparser.h"
|
||||||
|
|
||||||
class ColliderComponent;
|
class ColliderComponent;
|
||||||
class AssetManager;
|
class AssetManager;
|
||||||
|
Loading…
Reference in New Issue
Block a user