Andrew Belt
6 years ago
2 changed files with 3 additions and 4 deletions
Unified View
Diff Options
-
+3 -3compile.mk
-
+0 -1dep.mk
+ 3
- 3
compile.mk
View File
| @@ -43,8 +43,8 @@ CXXFLAGS += $(FLAGS) | |||||
| # Derive object files from sources and place them before user-defined objects | # Derive object files from sources and place them before user-defined objects | ||||
| OBJECTS := $(patsubst %, build/%.o, $(SOURCES)) $(OBJECTS) | |||||
| DEPS := $(patsubst %, build/%.d, $(SOURCES)) | |||||
| OBJECTS += $(patsubst %, build/%.o, $(SOURCES)) | |||||
| DEPENDENCIES := $(patsubst %, build/%.d, $(SOURCES)) | |||||
| # Final targets | # Final targets | ||||
| @@ -52,7 +52,7 @@ DEPS := $(patsubst %, build/%.d, $(SOURCES)) | |||||
| $(TARGET): $(RESOURCES) $(OBJECTS) | $(TARGET): $(RESOURCES) $(OBJECTS) | ||||
| $(CXX) -o $@ $(OBJECTS) $(LDFLAGS) | $(CXX) -o $@ $(OBJECTS) $(LDFLAGS) | ||||
| -include $(DEPS) | |||||
| -include $(DEPENDENCIES) | |||||
| build/%.c.o: %.c | build/%.c.o: %.c | ||||
| @mkdir -p $(@D) | @mkdir -p $(@D) | ||||
+ 0
- 1
dep.mk
View File
| @@ -22,7 +22,6 @@ else | |||||
| CMAKE := cmake -DCMAKE_INSTALL_PREFIX="$(realpath $(DEP_LOCAL))" | CMAKE := cmake -DCMAKE_INSTALL_PREFIX="$(realpath $(DEP_LOCAL))" | ||||
| endif | endif | ||||
| # Export environment for all dependency targets | # Export environment for all dependency targets | ||||
| $(DEPS): export CFLAGS = $(DEP_CFLAGS) | $(DEPS): export CFLAGS = $(DEP_CFLAGS) | ||||
| $(DEPS): export CXXFLAGS = $(DEP_CXXFLAGS) | $(DEPS): export CXXFLAGS = $(DEP_CXXFLAGS) | ||||