etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 03:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile adjustments for coop-compiler

Browse source
This commit is contained in:
MysterD 2023-04-29 18:14:44 -07:00
parent 242740fbf5
commit bc0a7f948f
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Makefile
View file

@ -106,19 +106,6 @@ dev:; @$(MAKE) DEVELOPMENT=1
COMPILER = gcc COMPILER = gcc
$(eval $(call validate-option,COMPILER,ido gcc clang)) $(eval $(call validate-option,COMPILER,ido gcc clang))
ifeq ($(WINDOWS_AUTO_BUILDER),1)
export SHELL=sh.exe
EXTRA_INCLUDES := -I ../include/1 -I ../include/2 -I ../include/3 -I ../include/4
EXTRA_CFLAGS += -Wno-expansion-to-defined
EXTRA_CPP_INCLUDES := -I ../include/cpp
EXTRA_CPP_FLAGS := -Wno-class-conversion -Wno-packed-not-aligned
else
EXTRA_INCLUDES ?=
EXTRA_CPP_INCLUDES ?=
endif
# Attempt to detect OS # Attempt to detect OS
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
@ -168,6 +155,24 @@ ifneq ($(TARGET_BITS),0)
BITS := -m$(TARGET_BITS) BITS := -m$(TARGET_BITS)
endif endif
ifeq ($(WINDOWS_AUTO_BUILDER),1)
export SHELL=sh.exe
ifeq ($(TARGET_BITS), 32)
EXTRA_INCLUDES := ../include/1 ../include/2 ../include/3 ../include/4
EXTRA_CPP_INCLUDES := ../include/cpp
else
EXTRA_INCLUDES :=
EXTRA_CPP_INCLUDES :=
endif
EXTRA_CFLAGS += -Wno-expansion-to-defined
EXTRA_CPP_FLAGS := -Wno-class-conversion -Wno-packed-not-aligned
else
EXTRA_INCLUDES ?=
EXTRA_CPP_INCLUDES ?=
endif
# VERSION - selects the version of the game to build # VERSION - selects the version of the game to build
# jp - builds the 1996 Japanese version # jp - builds the 1996 Japanese version
@ -1508,17 +1513,17 @@ $(GLOBAL_ASM_DEP).$(NON_MATCHING):
# Compile C++ code # Compile C++ code
$(BUILD_DIR)/%.o: %.cpp $(BUILD_DIR)/%.o: %.cpp
$(call print,Compiling:,$<,$@) $(call print,Compiling:,$<,$@)
@$(CXX) $(PROF_FLAGS) -fsyntax-only $(EXTRA_CPP_FLAGS) $(EXTRA_CPP_INCLUDES) $(CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $< $(V)$(CXX) $(PROF_FLAGS) -fsyntax-only $(EXTRA_CPP_FLAGS) $(EXTRA_CPP_INCLUDES) $(CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CXX) $(PROF_FLAGS) -c $(EXTRA_CPP_FLAGS) $(EXTRA_CPP_INCLUDES) $(CFLAGS) -o $@ $< $(V)$(CXX) $(PROF_FLAGS) -c $(EXTRA_CPP_FLAGS) $(EXTRA_CPP_INCLUDES) $(CFLAGS) -o $@ $<
# Compile C code # Compile C code
$(BUILD_DIR)/%.o: %.c $(BUILD_DIR)/%.o: %.c
$(call print,Compiling:,$<,$@) $(call print,Compiling:,$<,$@)
@$(CC_CHECK) $(PROF_FLAGS) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $< $(V)$(CC_CHECK) $(PROF_FLAGS) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) $(PROF_FLAGS) -c $(CFLAGS) -o $@ $< $(V)$(CC) $(PROF_FLAGS) -c $(CFLAGS) -o $@ $<
$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c $(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c
$(call print,Compiling:,$<,$@) $(call print,Compiling:,$<,$@)
@$(CC_CHECK) $(PROF_FLAGS) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $< $(V)$(CC_CHECK) $(PROF_FLAGS) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) $(PROF_FLAGS) -c $(CFLAGS) -o $@ $< $(V)$(CC) $(PROF_FLAGS) -c $(CFLAGS) -o $@ $<
# Alternate compiler flags needed for matching # Alternate compiler flags needed for matching