summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2020-04-18 00:00:48 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2020-04-18 00:00:48 -0400
commit6446890d29234348c6af89982db4a4d8518855d4 (patch)
tree258f1c319f6edaa4eebb010e86d97dda8b8aa98c
parenta238294da9efc1116921db001bd786c4f522c9a1 (diff)
tidy up dependencies and tweak Makefile to show tool being ran once at start
-rw-r--r--INSTALL.md14
-rw-r--r--Makefile10
2 files changed, 14 insertions, 10 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 4dc41576..29c650d8 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,14 +1,16 @@
-#### 1. Copy baserom(s) into root folder
+### 1. Copy baserom(s) into root folder
Put a clean copy of Pokemon Diamond (US) nds rom at `./baserom.us.nds`.
-#### 2. Install MWCC compiler
+### 2. Install MWCC compiler
The build system requires the use of the Metrowerk C Compiler 2.0/base to compile matching files. We cannot distribute the correct compiler here so join the PRET discord and download the pinned mwccarm.zip zip in #pokediamond and extract it to tools/. Run each of the executables so they ask for a license.dat and provide the one in the rar (it may also ask for it when compiling). This only needs to be done once.
In the future, a GCC option will be available so MWCC is not required to build, however it is required for a matching ROM.
-#### 3. Dependencies
+### 3. Dependencies
+
+#### Linux
Building the ROM requires the following packages:
@@ -18,6 +20,10 @@ Building the ROM requires the following packages:
* libssl-dev
* binutils-arm-linux-gnueabi
-#### 4. Build ROM
+#### Windows
+
+TODO
+
+### 4. Build ROM
Run `make` to build the ROM. \ No newline at end of file
diff --git a/Makefile b/Makefile
index cd726fe7..0b43fef2 100644
--- a/Makefile
+++ b/Makefile
@@ -73,11 +73,6 @@ TOOLS_DIR = tools
SHA1SUM = sha1sum
MWASMARM_PATCHER = tools/mwasmarm_patcher/mwasmarm_patcher$(EXE)
-DUMMY != $(MWASMARM_PATCHER) $(MWASMARM) || echo FAIL
-ifeq ($(DUMMY),FAIL)
- $(error MWASMARM patcher returned an error)
-endif
-
######################### Targets ###########################
all: $(ROM)
@@ -86,12 +81,15 @@ all: $(ROM)
clean:
$(RM) -r $(BUILD_DIR)
+patch_mwasmarm:
+ $(MWASMARM_PATCHER) $(MWASMARM)
+
ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(ASM_DIRS))
$(BUILD_DIR)/%.o: %.c
$(CC) -c $(CFLAGS) -o $@ $<
-$(BUILD_DIR)/%.o: %.s
+$(BUILD_DIR)/%.o: %.s patch_mwasmarm
$(AS) $(ASFLAGS) $< -o $@
$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT)