Commit Graph

128 Commits

Author SHA1 Message Date
yenatch
5dfe27125b Merge branch 'master' into tools-makefile-integration 2017-06-24 20:42:25 -04:00
yenatch
f03b898250 Add a md5 tool to avoid md5sum dependency.
md5sum is missing in macOS and (presumably) BSD.

An alternative would have been to use sha1sum instead, but it's probably
a good idea to have as few dependencies as possible, so this doesn't
happen again.

fixes #364
2017-06-24 18:42:28 -04:00
yenatch
f12e42ab6d Use SHA1 to compare roms 2017-06-24 18:32:54 -04:00
yenatch
9b1550c5e0 Explicit rules for gfx/shrink{1,2}.2bpp 2017-06-24 16:31:42 -04:00
yenatch
a20664d415 Fix gfx/misc 2017-06-24 16:30:12 -04:00
yenatch
803c5154f4 pngs in gfx/unknown 2017-06-24 16:27:52 -04:00
yenatch
131bda73bc pngs in gfx/misc 2017-06-24 02:50:42 -04:00
yenatch
41ae3610f6 pngs in gfx/fx
- gave up on wind.png
- add --remove-yflip
2017-06-24 00:47:55 -04:00
yenatch
1f81d1851f pngs in gfx/ 2017-06-23 19:56:24 -04:00
yenatch
89093e4670 pngs in gfx/trainers 2017-06-22 23:46:58 -04:00
yenatch
31d9c1fffa pngs in gfx/trade
game_boy.png can be rearranged in a nicer way, but it's a job for another time
2017-06-22 23:45:45 -04:00
yenatch
647f9b4452 pngs in gfx/title 2017-06-21 23:45:01 -04:00
yenatch
f10ed64d1a pngs in gfx/pokedex 2017-06-20 23:42:29 -04:00
yenatch
93a3a7d3c5 Use $(if) in the makefile. Fix gfx/mail.
Fixes 384788f370
2017-06-20 23:36:28 -04:00
yenatch
384788f370 pngs in gfx/mail 2017-06-18 00:13:03 -04:00
Ben10do
fc300ab0ee
Fix parallelisation issues in Makefile
Introduces a minor hack, in order to ensure that the tools are built before the Makefile attempts to use any of the tools, even when using ‘make -j’.
2017-06-10 18:21:38 +01:00
Ben10do
202cea9705
- Make the tools implicitly when making the ROM
- Add a clean target to the tools Makefile
- Run said clean target when cleaning the pokecrystal directory
2017-06-09 21:55:09 +01:00
yenatch
6001eeba40 makefile misc qol
- md5sum: no more --quiet. this flag is not standard and seeing "OK" is probably better
- saner use of $(roms)
2017-05-29 23:22:24 -04:00
yenatch
2f2aa10c9c Reorder the build targets for backwards compatibility with gmake 3.81. 2017-05-29 23:21:42 -04:00
yenatch
e78034eb8c Use a separate makefile for tools
- Fix crystal11
- Fix a bug where the dependency checks would run regardless of target

Fixes 0bd74cdd73
2017-05-29 19:15:34 -04:00
yenatch
d6bf2468a1 Add targets for the pokemon animation edge cases. 2017-05-28 23:23:11 -04:00
yenatch
0bd74cdd73 Fix crystal11 after clean 2017-05-28 15:53:30 -04:00
yenatch
1a549990da Accidentally deleted the pokemon palette rule 2017-05-28 15:53:06 -04:00
yenatch
e9c1d24c31 Add Pokemon pic pngs.
Copies of the matching compressed files are kept, so files with a matching hash will use the matching compressed file instead.

This is the best that can be done until the compressor is fixed, which may never happen.
2017-05-28 14:03:13 -04:00
yenatch
22058020f4 Fix intermediate files once and for all.
GNU Make defaults to deleting all intermediate files unless .SECONDARY is defined.
2017-05-28 01:22:17 -04:00
yenatch
517136b0d9 Fix the graphics rules 2017-05-28 01:20:58 -04:00
yenatch
caa94f8412 Fix the lzcomp rule. 2017-04-28 00:37:42 -04:00
yenatch
f09a233eba Add rules previously covered by gfx.py. 2016-08-24 22:03:12 -04:00
yenatch
2ab468268a Add C build tools. 2016-08-24 21:56:07 -04:00
yenatch
05cffac744 Add a custom scan_includes.py. 2016-04-10 19:19:58 -04:00
dannye
8d1551ec9d Revert 85d30fa079 2016-03-24 11:27:02 -05:00
yenatch
85d30fa079 Fix make deleting files that aren't actually intermediate.
make was deciding that a couple .blk files were actually intermediate.
Still don't know what is causing that issue. This is a temporary fix
that will probably be forgotten about and become a permanent one.
2016-03-21 08:04:00 -04:00
yenatch
1f784700b9 Fix the symfile.
gnu make redefines $* to mean % in spite of posix.
2016-03-16 17:54:20 -04:00
yenatch
3810cefaa2 Suppress deletion of .1bpp files. 2016-03-03 00:06:09 -05:00
yenatch
13f5590abe Trim some whitespace in the makefile. 2016-03-01 23:39:01 -05:00
yenatch
370f84227b Suppress deletion of intermediate .2bpp files. 2016-03-01 23:38:36 -05:00
yenatch
0be6e6c910 Remove useless lines in the makefile.
The previous rules were composed this way but only because target-specific variables weren't used. As they are now, they actually do nothing.
2016-03-01 21:13:38 -05:00
yenatch
e11ef2b8d5 Only generate dependencies for a target when it's invoked.
This means dependencies for unrelated targets aren't generated if you aren't building them. This makes "make clean" and building individual targets fast again.
2016-03-01 21:01:34 -05:00
yenatch
782cbc14d6 Only use suffixes needed for intermediate rules.
This is technically a hack, since keeping the .asm suffix was causing nonexistent rules to be evaluated as per the next commit. On the other hand, this is the intended purpose of .SUFFIXES.
2016-03-01 20:58:00 -05:00
yenatch
73a660bf2a Remove "make pngs". 2016-02-17 16:22:05 -05:00
yenatch
36f0bda0b3 Use static pattern rules to fix dependencies for objects in subdirs. 2016-02-10 00:31:32 -05:00
yenatch
08ac6dfd80 *_crystal.asm files are no longer needed to build crystal *.o. 2016-01-29 16:24:38 -05:00
yenatch
1176712cfe Use rgbasm -D instead of extra files for version differences. 2016-01-29 01:10:41 -05:00
IIMarckus
82e2fe78e1 Split common text into a separate object. 2015-12-18 00:59:03 -07:00
PikalaxALT
434c97a146 Makefile cleanup 2015-11-15 15:53:49 -05:00
IIMarckus
25c126c69b Revert bad merge.
"Merge pull request #317 from yenatch/pngs-kind-of"

This reverts commit 25025d1b6c, reversing
changes made to 0d17d4a758.
2015-11-01 16:06:15 -07:00
yenatch
b8da3874bb Add an init makefile target to prevent data that can't be reasonably reproduced from being rebuilt.
This is only meant to be run once.
2015-09-01 00:20:31 -04:00
yenatch
f0af75e8d2 Fix touching in make pngs. 2015-08-29 11:02:56 -07:00
yenatch
9c4fb6a6a4 Add a script to convert project-specific graphics.
This is an alternative to terrible hacks like filename metadata, and might combat submodule bloat.
2015-06-28 23:53:49 -07:00
yenatch
07b9c4b030 Fix the make pngs target. 2015-06-26 10:47:13 -07:00