diff --git a/Makefile b/Makefile index b468ed2..9aa2e2b 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,9 @@ 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) -Ilibtmx-parser/src -Ilibtmx-parser/libs/tinyxml2 -MMD -MP -w -# libxml2/.libs/libxml2.a -lSDL2_image -lSDL2_mixer -LINKER_FLAGS = -lSDL2 libsdl2_image/.libs/libSDL2_image.a libsdl2_mixer/build/.libs/libSDL2_mixer.a libtmx-parser/libtmxparser.a +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 $(BUILD_DIR)/$(TARGET_EXEC): $(OBJS) # $(CC) $(OBJS) -o $@ $(LDFLAGS) $(CXX) $(OBJS) $(LINKER_FLAGS) -o $@ diff --git a/build/BeagleRescue b/build/BeagleRescue index e122b04..a42fd4e 100755 Binary files a/build/BeagleRescue and b/build/BeagleRescue differ diff --git a/src/ecs/TileMapComponent.h b/src/ecs/TileMapComponent.h index 2dc5935..b2c10e7 100644 --- a/src/ecs/TileMapComponent.h +++ b/src/ecs/TileMapComponent.h @@ -9,7 +9,7 @@ #define SRC_ECS_TILEMAPCOMPONENT_H_ #include "ECS.h" -#include "SDL2/SDL.h" +#include "../../libsdl2/include/SDL.h" #include "../assetmgr/AssetManager.h" #include #include diff --git a/src/game/Game.hpp b/src/game/Game.hpp index f941e71..2c7e56e 100644 --- a/src/game/Game.hpp +++ b/src/game/Game.hpp @@ -7,7 +7,7 @@ #ifndef GAME_HPP_ #define GAME_HPP_ -#include "SDL2/SDL.h" +#include "../../libsdl2/include/SDL.h" #include "../../libsdl2_image/SDL_image.h" #include "../../libsdl2_mixer/SDL_mixer.h" #include