diff -ru cvs/apps/Makefile build/apps/Makefile --- cvs/apps/Makefile Thu Aug 15 19:49:23 2002 +++ build/apps/Makefile Thu Aug 15 23:34:44 2002 @@ -43,7 +43,11 @@ SRC := $(wildcard *.c) ifeq ($(TARGET),-DARCHOS_RECORDER) +ifeq (,$(findstring -DWITHOUT_TOYS,$(EXTRA_DEFINES))) SRC += $(wildcard recorder/*.c) +else + SRC += recorder/icons.c recorder/widgets.c +endif CFLAGS += -Irecorder OUTNAME = ajbrec.ajz else diff -ru cvs/apps/games_menu.c build/apps/games_menu.c --- cvs/apps/games_menu.c Thu Jun 27 03:08:11 2002 +++ build/apps/games_menu.c Thu Aug 15 22:26:06 2002 @@ -18,7 +18,7 @@ ****************************************************************************/ #include "config.h" -#ifdef HAVE_LCD_BITMAP +#if defined(HAVE_LCD_BITMAP) && !defined(WITHOUT_TOYS) #include #include #include "lcd.h" diff -ru cvs/apps/main_menu.c build/apps/main_menu.c --- cvs/apps/main_menu.c Thu Aug 15 19:49:23 2002 +++ build/apps/main_menu.c Thu Aug 15 22:44:02 2002 @@ -36,8 +36,10 @@ #include "sound_menu.h" #ifdef HAVE_LCD_BITMAP +#ifndef WITHOUT_TOYS #include "games_menu.h" #include "screensavers_menu.h" +#endif #include "bmp.h" #include "icons.h" #endif @@ -189,7 +191,7 @@ struct menu_items items[] = { { "Sound Settings", sound_menu }, { "General Settings", settings_menu }, -#ifdef HAVE_LCD_BITMAP +#if defined(HAVE_LCD_BITMAP) && !defined(WITHOUT_TOYS) { "Games", games_menu }, { "Screensavers", screensavers_menu }, #endif diff -ru cvs/apps/screensavers_menu.c build/apps/screensavers_menu.c --- cvs/apps/screensavers_menu.c Sun Aug 11 16:05:13 2002 +++ build/apps/screensavers_menu.c Thu Aug 15 22:51:21 2002 @@ -18,7 +18,7 @@ ****************************************************************************/ #include "config.h" -#ifdef HAVE_LCD_BITMAP +#if defined(HAVE_LCD_BITMAP) && !defined(WITHOUT_TOYS) #include #include Only in build/tools: bdf2ajf diff -ru cvs/tools/configure build/tools/configure --- cvs/tools/configure Thu Aug 15 19:49:28 2002 +++ build/tools/configure Thu Aug 15 23:36:27 2002 @@ -87,7 +87,7 @@ all: sim sim: - \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES) + \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES="\$(EXTRA_DEFINES)" clean: \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) clean @@ -198,6 +198,13 @@ extra_defines="" fi fi + + echo "Disable games and screensavers? (N)" + getit=`input`; + if [ "y" = "$getit" -o "Y" = "$getit" ] ; then + extra_defines="$extra_defines -DWITHOUT_TOYS" + fi + else extra_defines="" fi @@ -296,10 +303,10 @@ all: firmware apps firmware: - \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES=\$(EXTRA_DEFINES) + \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) EXTRA_DEFINES="\$(EXTRA_DEFINES)" apps: - \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES=\$(EXTRA_DEFINES) + \$(MAKE) -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) EXTRA_DEFINES="\$(EXTRA_DEFINES)" clean-firmware: \$(MAKE) -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean