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

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
 # Check if this is a kind of Recorder
 ANYREC = $(findstring RECORDER, $(TARGET))
 
+# scramble tool
+TOOL = scramble
+
 ifndef MEM
     # if MEM is not set, assume 2MB
     MEM=2
@@ -56,19 +59,17 @@ ifeq ($(ANYREC), RECORDER)
    SRC += $(wildcard recorder/*.c)
    CFLAGS += -Irecorder
    OUTNAME = ajbrec.ajz
-   TOOL = scramble
 else
 ifeq ($(TARGET), -DARCHOS_PLAYER)
    SRC += $(wildcard player/*.c)
    CFLAGS += -Iplayer
    OUTNAME = archos.mod
-   TOOL = scramble
 else
 # some kind of Neo 
    SRC += $(wildcard neo/*.c)
    CFLAGS += -Ineo
    OUTNAME = Rockbox.bin
-   TOOL = mkneofile
+   TOOL_OPT = -neo
 endif
 endif