Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up Makefile for coop-compiler

This commit is contained in:
MysterD 2022-03-21 16:46:31 -07:00
parent bd5263140a
commit 155f566eb9
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -2,9 +2,6 @@
include util.mk include util.mk
# Dynos
include dynos.mk
# Default target # Default target
default: all default: all
@ -96,7 +93,7 @@ $(eval $(call validate-option,COMPILER,ido gcc))
ifeq ($(WINDOWS_AUTO_BUILDER),1) ifeq ($(WINDOWS_AUTO_BUILDER),1)
export SHELL=sh.exe export SHELL=sh.exe
EXTRA_INCLUDES := ../include/1 ../include/2 ../include/3 ../include/4 EXTRA_INCLUDES := -I ../include/1 -I ../include/2 -I ../include/3 -I ../include/4
EXTRA_CFLAGS := -Wno-expansion-to-defined EXTRA_CFLAGS := -Wno-expansion-to-defined
EXTRA_CPP_INCLUDES := ../include/cpp EXTRA_CPP_INCLUDES := ../include/cpp
@ -476,6 +473,9 @@ GODDARD_SRC_DIRS := src/goddard src/goddard/dynlists
# File dependencies and variables for specific files # File dependencies and variables for specific files
include Makefile.split include Makefile.split
# Dynos
include dynos.mk
# Source code files # Source code files
LEVEL_C_FILES := $(wildcard levels/*/leveldata.c) $(wildcard levels/*/script.c) $(wildcard levels/*/geo.c) LEVEL_C_FILES := $(wildcard levels/*/leveldata.c) $(wildcard levels/*/script.c) $(wildcard levels/*/geo.c)
C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) $(LEVEL_C_FILES) C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) $(LEVEL_C_FILES)

6
Makefile.split
View File

@ -188,12 +188,16 @@ endef
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),distclean) ifneq ($(MAKECMDGOALS),distclean)
ifeq ($(WINDOWS_AUTO_BUILDER),1)
include $(BUILD_DIR)/level_rules.mk
else
$(BUILD_DIR)/level_rules.mk: levels/level_rules.mk levels/level_defines.h $(BUILD_DIR)/level_rules.mk: levels/level_rules.mk levels/level_defines.h
@$(PRINT) "$(GREEN)Preprocessing level make rules: $(BLUE)$@ $(NO_COL)\n" @$(PRINT) "$(GREEN)Preprocessing level make rules: $(BLUE)$@ $(NO_COL)\n"
@$(CPP) $(VERSION_CFLAGS) -I . $(EXTRA_INCLUDES) -o $@ $< $(V)$(CPP) $(VERSION_CFLAGS) -I . $(EXTRA_INCLUDES) -o $@ $<
include $(BUILD_DIR)/level_rules.mk include $(BUILD_DIR)/level_rules.mk
endif endif
endif endif
endif
# -------------------------------------- # --------------------------------------
# Extra Level Rules # Extra Level Rules