mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-25 05:25:14 +00:00
Add cpp stuff for coop-compiler
This commit is contained in:
parent
02968831c7
commit
2f15b4664c
1 changed files with 8 additions and 2 deletions
10
Makefile
10
Makefile
|
@ -94,9 +94,15 @@ ifeq ($(WINDOWS_AUTO_BUILDER),1)
|
||||||
export SHELL=sh.exe
|
export SHELL=sh.exe
|
||||||
EXTRA_INCLUDES := -I ../include/1 -I ../include/2 -I ../include/3 -I ../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 := -I ../include/cpp
|
||||||
|
EXTRA_CPP_FLAGS := -Wno-class-conversion -Wno-packed-not-aligned
|
||||||
else
|
else
|
||||||
EXTRA_INCLUDES ?=
|
EXTRA_INCLUDES ?=
|
||||||
EXTRA_CFLAGS ?=
|
EXTRA_CFLAGS ?=
|
||||||
|
|
||||||
|
EXTRA_CPP_INCLUDES ?=
|
||||||
|
EXTRA_CPP_FLAGS ?=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRACT_ASSETS := $(PYTHON) ./extract_assets.py
|
EXTRACT_ASSETS := $(PYTHON) ./extract_assets.py
|
||||||
|
@ -1161,8 +1167,8 @@ $(GLOBAL_ASM_DEP).$(NON_MATCHING):
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
$(BUILD_DIR)/%.o: %.cpp
|
$(BUILD_DIR)/%.o: %.cpp
|
||||||
@$(CXX) -fsyntax-only $(CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
|
@$(CXX) -fsyntax-only $(EXTRA_CPP_FLAGS) $(EXTRA_CPP_INCLUDES) $(CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
|
||||||
$(CXX) -c $(CFLAGS) -o $@ $<
|
$(CXX) -c $(EXTRA_CPP_FLAGS) $(EXTRA_CPP_INCLUDES) $(CFLAGS) -o $@ $<
|
||||||
|
|
||||||
$(BUILD_DIR)/%.o: %.c
|
$(BUILD_DIR)/%.o: %.c
|
||||||
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
|
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
|
||||||
|
|
Loading…
Reference in a new issue