mirror of
https://github.com/pret/pokeheartgold.git
synced 2025-02-26 16:15:50 +00:00
Fix build
This commit is contained in:
parent
bd89e2eccb
commit
96ec1a42b0
14
common.mk
14
common.mk
@ -110,8 +110,8 @@ ARFLAGS := rcS
|
||||
|
||||
$(C_OBJS): MWCFLAGS += -include global.h
|
||||
|
||||
CC = $(WINE) $(MWCC) $(MWCFLAGS)
|
||||
AS = $(WINE) $(MWAS) $(MWASFLAGS)
|
||||
MW_COMPILE = $(WINE) $(MWCC) $(MWCFLAGS)
|
||||
MW_ASSEMBLE = $(WINE) $(MWAS) $(MWASFLAGS)
|
||||
|
||||
export MWCIncludes := lib/include
|
||||
|
||||
@ -153,9 +153,9 @@ endef
|
||||
endif
|
||||
DEPFLAGS := -gccdep -MD
|
||||
DEPFILES := $(ALL_OBJS:%.o=%.d)
|
||||
CC += $(DEPFLAGS)
|
||||
$(GLOBAL_ASM_OBJS): BUILD_C := $(ASM_PROCESSOR) "$(CC)" "$(AS)"
|
||||
BUILD_C ?= $(CC) -c -o
|
||||
MW_COMPILE += $(DEPFLAGS)
|
||||
$(GLOBAL_ASM_OBJS): BUILD_C := $(ASM_PROCESSOR) "$(MW_COMPILE)" "$(MW_ASSEMBLE)"
|
||||
BUILD_C ?= $(MW_COMPILE) -c -o
|
||||
|
||||
$(DEPFILES):
|
||||
|
||||
@ -173,8 +173,8 @@ $(BUILD_DIR)/%.o: %.s $(BUILD_DIR)/%.d
|
||||
|
||||
include $(wildcard $(DEPFILES))
|
||||
else
|
||||
$(GLOBAL_ASM_OBJS): BUILD_C := $(ASM_PROCESSOR) "$(CC)" "$(AS)"
|
||||
BUILD_C ?= $(CC) -c -o
|
||||
$(GLOBAL_ASM_OBJS): BUILD_C := $(ASM_PROCESSOR) "$(MW_COMPILE)" "$(MW_ASSEMBLE)"
|
||||
BUILD_C ?= $(MW_COMPILE) -c -o
|
||||
|
||||
$(BUILD_DIR)/%.o: %.c
|
||||
$(BUILD_C) $@ $<
|
||||
|
@ -1,3 +1,4 @@
|
||||
CC = gcc
|
||||
CFLAGS := -O3 -g -DNDEBUG -DSOURCE_DIR="\"$(CURDIR)\""
|
||||
|
||||
SRCS := main.c fx_encode.c fx_data.c
|
||||
|
Loading…
x
Reference in New Issue
Block a user