remove includes

goblinhack · Jan 25, 2024 · 81e2bf3 · 81e2bf3
1 parent af58850
commit 81e2bf3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 $@ $<