diff options
| author | garak <garakmon@gmail.com> | 2018-09-24 08:39:26 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-09-24 08:39:26 -0400 |
| commit | 3964dbd4822f1b22bbc696add7e56ff0c5b2caea (patch) | |
| tree | 9d793b7afecd0d145b2d1e57d271a5583cbe0187 | |
| parent | 0d6f8ba5e48fa73be242d62df8d940fa2c61c06a (diff) | |
| parent | e0a9faacb58311b697cf704823f8279a077716f0 (diff) | |
Merge branch 'master' of https://github.com/garakmon/pokeemerald
| -rw-r--r-- | INSTALL.md | 14 | ||||
| -rw-r--r-- | Makefile | 9 |
2 files changed, 8 insertions, 15 deletions
diff --git a/INSTALL.md b/INSTALL.md index 3fe819594..041f6b8e9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -64,7 +64,7 @@ cd ../pokeemerald ./build_tools.sh ``` -And build the ROM with `make -j4`. +And build the ROM with `make`. # Faster builds @@ -78,12 +78,12 @@ By default `make` only runs a single thread. You can tell `make` to run on multi The optimal value for `-j` is the number of logical cores on your machine. You can run `nproc` to see the exact number. - $ nproc - 8 - -If you have 8 cores, run: +``` +$ nproc +8 +``` - make -j8 +If you have 8 cores, run: `make -j8` `-j` on its own will spawn a new thread for each job. A clean build will have thousands of jobs, which will be slower than not using -j at all. @@ -91,5 +91,5 @@ If you have 8 cores, run: If you've only changed `.c` or `.s` files, you can turn off the dependency scanning temporarily. Changes to any other files will be ignored, and the build will either fail or not reflect those changes. - make NODEP=1 +`make NODEP=1` @@ -31,14 +31,7 @@ LDFLAGS = -Map ../../$(MAP) LIB := -L ../../tools/agbcc/lib -lgcc -lc -ifeq ($(OS),Windows_NT) - SHA1 := sha1sum -c -else ifeq ($(shell uname -s),Darwin) - SHA1 := shasum -c -else - SHA1 := sha1sum -c -endif - +SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c GFX := tools/gbagfx/gbagfx AIF := tools/aif2pcm/aif2pcm MID := $(abspath tools/mid2agb/mid2agb) |