projects
/
gba_blender
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
panning
[gba_blender]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
be6de8f
..
3484b4a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,7
+12,8
@@
data = data/bg.raw data/bg.pal \
data/sprites2.pal \
data/sprites3.pal \
data/sprites4.pal \
data/sprites2.pal \
data/sprites3.pal \
data/sprites4.pal \
- data/sprites5.pal
+ data/sprites5.pal \
+ data/sprites6.pal
ARCH = arm-none-eabi-
ARCH = arm-none-eabi-
@@
-24,8
+25,9
@@
EMU = vbam
opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
#dbg = -g
opt = -O3 -fomit-frame-pointer -mcpu=arm7tdmi -mtune=arm7tdmi -mthumb -mthumb-interwork
#dbg = -g
+def = -DALT_LCLIP
-CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD
+CFLAGS = $(opt) $(dbg) -pedantic -Wall -MMD $(def)
ASFLAGS = -mthumb-interwork
LDFLAGS = -mthumb -mthumb-interwork -lm
EMUFLAGS = -T 100 -f 1 --agb-print
ASFLAGS = -mthumb-interwork
LDFLAGS = -mthumb -mthumb-interwork -lm
EMUFLAGS = -T 100 -f 1 --agb-print
@@
-48,7
+50,7
@@
src/data.o: src/data.s $(data)
tools/pngdump/pngdump:
$(MAKE) -C tools/pngdump
tools/pngdump/pngdump:
$(MAKE) -C tools/pngdump
-data/sprites.raw: data/sprites1.png data/sprites2.png data/sprites3.png data/sprites4.png data/sprites5.png
+data/sprites.raw: data/sprites1.png data/sprites2.png data/sprites3.png data/sprites4.png data/sprites5.png data/sprites6.png
tools/pngdump/pngdump -o $@ -n $^
%.raw: %.png tools/pngdump/pngdump
tools/pngdump/pngdump -o $@ -n $^
%.raw: %.png tools/pngdump/pngdump