diff options
| author | red031000 <rubenru09@aol.com> | 2020-05-29 19:19:23 +0100 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2020-05-29 19:19:23 +0100 |
| commit | 8a350c7fbc6eada528d98849b560d1f67a0a0503 (patch) | |
| tree | 95ec04e11fb033c18eada6276acf1036a6879367 /arm9/Makefile | |
| parent | a95d56466d4e3009c8efa73f6fe3bd2354d301e0 (diff) | |
| parent | e6c0d16a679663e816130ca7bc793cab682f911c (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond
Diffstat (limited to 'arm9/Makefile')
| -rw-r--r-- | arm9/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arm9/Makefile b/arm9/Makefile index 19b31dd8..838b2260 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -1,5 +1,7 @@ # Makefile to build Pokemon Diamond image +include config.mk + .PHONY: clean tidy all default patch_mwasmarm # Try to include devkitarm if installed @@ -182,8 +184,8 @@ OBJCOPY := $(CROSS)objcopy # ./tools/mwccarm/2.0/base/mwasmarm.exe -proc arm5te asm/arm9_thumb.s -o arm9.o ASFLAGS = -proc arm5te -i .. -CFLAGS = -O4,p -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -ir ../include -ir ../include-mw -ir lib/include -interworking -DFS_IMPLEMENT -enum int -W all -W error -CXXFLAGS = -O4,p -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -ir ../include -ir ../include-mw -ir lib/include -interworking -DFS_IMPLEMENT -enum int -W all -W error +CFLAGS = -O4,p -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -ir ../include -ir ../include-mw -ir lib/include -interworking -DFS_IMPLEMENT -enum int -W all -W error -D$(GAME_VERSION) -D$(GAME_LANGUAGE) +CXXFLAGS = -O4,p -proc arm946e -fp soft -lang c99 -Cpp_exceptions off -ir ../include -ir ../include-mw -ir lib/include -interworking -DFS_IMPLEMENT -enum int -W all -W error -D$(GAME_VERSION) -D$(GAME_LANGUAGE) LDFLAGS = -map -nodead -w off -proc v5te -interworking -map -symtab -m _start ####################### Other Tools ######################### @@ -200,6 +202,7 @@ TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%) TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE)) export LM_LICENSE_FILE := $(TOOLS_DIR)/mwccarm/license.dat +export MWCIncludes := lib/include ######################### Targets ########################### |