diff --git a/build/build.sh b/build/build.sh index a65ff1e..50b2c5d 100755 --- a/build/build.sh +++ b/build/build.sh @@ -270,7 +270,7 @@ LDLIBS="$LDLIBS -lSDL2_mixer" # # Common config file # -CONFIG_H=src/cfg.hpp +CONFIG_H=src/inc/cfg.hpp echo "#include \"my_cfg.hpp\"" > $CONFIG_H C_FLAGS+=" -Iinc -I../inc/ -include cfg.hpp" diff --git a/src/core/Makefile b/src/core/Makefile index 55434ea..105aa09 100644 --- a/src/core/Makefile +++ b/src/core/Makefile @@ -20,7 +20,7 @@ $(BUILD_DIR): ; mkdir -p $(BUILD_DIR) $(OBJECTS): | $(BUILD_DIR) $(BUILD_DIR)/%.o: %.cpp - $(CC) $(CFLAGS) $(DEP_FLAGS) -I ../../src -c -o $@ $< + $(CC) $(CFLAGS) $(DEP_FLAGS) -c -o $@ $< $(BUILD_DIR)/%.o: %.S $(CC) $(DEP_FLAGS) -c -o $@ $< diff --git a/src/gfx/Makefile b/src/gfx/Makefile index 55434ea..105aa09 100644 --- a/src/gfx/Makefile +++ b/src/gfx/Makefile @@ -20,7 +20,7 @@ $(BUILD_DIR): ; mkdir -p $(BUILD_DIR) $(OBJECTS): | $(BUILD_DIR) $(BUILD_DIR)/%.o: %.cpp - $(CC) $(CFLAGS) $(DEP_FLAGS) -I ../../src -c -o $@ $< + $(CC) $(CFLAGS) $(DEP_FLAGS) -c -o $@ $< $(BUILD_DIR)/%.o: %.S $(CC) $(DEP_FLAGS) -c -o $@ $< diff --git a/src/things/Makefile b/src/things/Makefile index ddc7b5d..c0275da 100644 --- a/src/things/Makefile +++ b/src/things/Makefile @@ -26,7 +26,7 @@ $(OBJECTS): | $(BUILD_DIR) \ $(BUILD_DIR)/player $(BUILD_DIR)/%.o: %.cpp - $(CC) $(CFLAGS) $(DEP_FLAGS) -I ../../src -c -o $@ $< + $(CC) $(CFLAGS) $(DEP_FLAGS) -c -o $@ $< $(BUILD_DIR)/%.o: %.S $(CC) $(DEP_FLAGS) -c -o $@ $< diff --git a/src/wid/Makefile b/src/wid/Makefile index 55434ea..105aa09 100644 --- a/src/wid/Makefile +++ b/src/wid/Makefile @@ -20,7 +20,7 @@ $(BUILD_DIR): ; mkdir -p $(BUILD_DIR) $(OBJECTS): | $(BUILD_DIR) $(BUILD_DIR)/%.o: %.cpp - $(CC) $(CFLAGS) $(DEP_FLAGS) -I ../../src -c -o $@ $< + $(CC) $(CFLAGS) $(DEP_FLAGS) -c -o $@ $< $(BUILD_DIR)/%.o: %.S $(CC) $(DEP_FLAGS) -c -o $@ $<