diff options
author | Daniel Stenberg <daniel@haxx.se> | 2003-12-12 14:07:28 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2003-12-12 14:07:28 +0000 |
commit | 0115af21d9badaab2fdb7e2404bea69a0504e4b0 (patch) | |
tree | d776d31422a5c978f9c9db5f046781c2c902f0f3 /apps | |
parent | d0f59105348bfb2d29596ff65b41a3aaeea86432 (diff) | |
download | rockbox-0115af21d9badaab2fdb7e2404bea69a0504e4b0.tar.gz rockbox-0115af21d9badaab2fdb7e2404bea69a0504e4b0.zip |
removed the neo-specific scramble-tool and made it an option to scramble
instead, and made the makefile use this
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4140 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile index bb7625b1c2..2fc9d97adb 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -31,6 +31,9 @@ AFLAGS += -small -relax | |||
31 | # Check if this is a kind of Recorder | 31 | # Check if this is a kind of Recorder |
32 | ANYREC = $(findstring RECORDER, $(TARGET)) | 32 | ANYREC = $(findstring RECORDER, $(TARGET)) |
33 | 33 | ||
34 | # scramble tool | ||
35 | TOOL = scramble | ||
36 | |||
34 | ifndef MEM | 37 | ifndef MEM |
35 | # if MEM is not set, assume 2MB | 38 | # if MEM is not set, assume 2MB |
36 | MEM=2 | 39 | MEM=2 |
@@ -56,19 +59,17 @@ ifeq ($(ANYREC), RECORDER) | |||
56 | SRC += $(wildcard recorder/*.c) | 59 | SRC += $(wildcard recorder/*.c) |
57 | CFLAGS += -Irecorder | 60 | CFLAGS += -Irecorder |
58 | OUTNAME = ajbrec.ajz | 61 | OUTNAME = ajbrec.ajz |
59 | TOOL = scramble | ||
60 | else | 62 | else |
61 | ifeq ($(TARGET), -DARCHOS_PLAYER) | 63 | ifeq ($(TARGET), -DARCHOS_PLAYER) |
62 | SRC += $(wildcard player/*.c) | 64 | SRC += $(wildcard player/*.c) |
63 | CFLAGS += -Iplayer | 65 | CFLAGS += -Iplayer |
64 | OUTNAME = archos.mod | 66 | OUTNAME = archos.mod |
65 | TOOL = scramble | ||
66 | else | 67 | else |
67 | # some kind of Neo | 68 | # some kind of Neo |
68 | SRC += $(wildcard neo/*.c) | 69 | SRC += $(wildcard neo/*.c) |
69 | CFLAGS += -Ineo | 70 | CFLAGS += -Ineo |
70 | OUTNAME = Rockbox.bin | 71 | OUTNAME = Rockbox.bin |
71 | TOOL = mkneofile | 72 | TOOL_OPT = -neo |
72 | endif | 73 | endif |
73 | endif | 74 | endif |
74 | 75 | ||