diff --git a/Makefile b/Makefile index 9aa2e2b..eab481b 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,11 @@ DEPS := $(OBJS:.o=.d) INC_DIRS := $(shell find $(SRC_DIRS) -type d) INC_FLAGS := $(addprefix -I,$(INC_DIRS)) -#-I$(LIBXML_ROOT) -Ilibsdl2_image -Ilibsdl2_mixer -CPPFLAGS ?= $(INC_FLAGS) -Ilibsdl2/include -Ilibtmx-parser/src -Ilibtmx-parser/libs/tinyxml2 -MMD -MP -w -# libxml2/.libs/libxml2.a -lSDL2_image -lSDL2_mixer -lSDL2 -LINKER_FLAGS = libsdl2/build/.libs/libSDL2.a libsdl2_image/.libs/libSDL2_image.a libsdl2_mixer/build/.libs/libSDL2_mixer.a libtmx-parser/libtmxparser.a + +CPPFLAGS ?= $(INC_FLAGS) -Ilibtmx-parser/src -Ilibtmx-parser/libs/tinyxml2 -MMD -MP -w -I$(LIBXML_ROOT) + +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 $@ diff --git a/build/BeagleRescue b/build/BeagleRescue index a42fd4e..5947728 100755 Binary files a/build/BeagleRescue and b/build/BeagleRescue differ diff --git a/rungame.sh b/rungame.sh deleted file mode 100755 index fc34db1..0000000 --- a/rungame.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -LD_LIBRARY_PATH=./libtmx-parser/ ./build/BeagleRescue