Index: tools/configure =================================================================== --- tools/configure (revision 29397) +++ tools/configure (working copy) @@ -26,7 +26,6 @@ sharedir= thread_support="ASSEMBLER_THREADS" -app_modelname= app_lcd_width= app_lcd_height= # @@ -610,7 +609,6 @@ GLOBAL_LDOPTS="$GLOBAL_LDOPTS -nostdlib -lc -Wl,--no-undefined -Wl,--gc-sections -Wl,-z,noexecstack \ --sysroot=$ANDROID_NDK_PATH/platforms/android-4/arch-arm" LDOPTS="$LDOPTS -shared -nostdlib -ldl -llog" - extradefines="$extradefines -DANDROID" endian="little" SHARED_FLAG="-shared" } @@ -2902,10 +2900,10 @@ ;; 200|sdlapp) + application="yes" target_id=73 - modelname="application" - app_modelname="sdlapp" - target="-DAPPLICATION" + modelname="sdlapp" + target="-DSDLAPP" app_set_paths app_set_lcd_size memory=8 @@ -2927,10 +2925,10 @@ ;; 201|android) + application="yes" target_id=74 - modelname="application" - app_modelname="android" - target="-DAPPLICATION" + modelname="android" + target="-DANDROID" app_type="android" app_set_lcd_size sharedir="/data/data/org.rockbox/app_rockbox/rockbox" @@ -2945,7 +2943,7 @@ bmp2rb_native="$rootdir/tools/bmp2rb -f 4" output="librockbox.so" bootoutput="librockbox.so" - appextra="recorder:gui:radio" + appextra="recorder:gui:radio:hosted" plugins="" swcodec="yes" # architecture, manufacturer and model for the target-tree build @@ -2955,12 +2953,11 @@ ;; 202|nokian8xx) + application="yes" target_id=75 - modelname="application" - app_modelname="nokian8xx" + modelname="nokian8xx" app_type="sdl-app" - target="-DAPPLICATION" - app_set_lcd_size 800 480 + target="-DNOKIAN8XX" sharedir="/opt/rockbox/share/rockbox" bindir="/opt/rockbox/bin" libdir="/opt/rockbox/lib" @@ -2983,12 +2980,11 @@ ;; 203|nokian900) + application="yes" target_id=76 - modelname="application" - app_modelname="nokian900" + modelname="nokian900" app_type="sdl-app" - target="-DAPPLICATION" - app_set_lcd_size 800 480 + target="-DNOKIAN900" sharedir="/opt/rockbox/share/rockbox" bindir="/opt/rockbox/bin" libdir="/opt/rockbox/lib" @@ -3236,6 +3232,11 @@ GCCOPTS="$GCCOPTS $GCCOPTIMIZE" fi +if [ "yes" = "$application" ]; then + echo Building Rockbox as an Application + extradefines="$extradefines -DAPPLICATION" +fi + echo "Using source code root directory: $rootdir" # this was once possible to change at build-time, but no more: @@ -3504,13 +3505,11 @@ if [ -n "$ARG_PREFIX" ]; then cmdline="$cmdline--prefix=\$(PREFIX) " fi -if [ "$modelname" = "application" ]; then - cmdline="$cmdline--target=$app_modelname --lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT " -else - cmdline="$cmdline--target=\$(MODELNAME) " +if [ -n "$ARG_LCDWIDTH" ]; then + cmdline="$cmdline--lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT " fi -cmdline="$cmdline--ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts" +cmdline="$cmdline--target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts" ### end of cmdline @@ -3561,6 +3560,7 @@ -e "s<@TOOLSDIR@<${toolsdir} \$install, # install destination 'rbdir:s' => \$rbdir, # If we want to put in a different directory 'l|link' => \$mklinks, # If we want to create links instead of copying files + 'a|app=s' => \$app, # Is this an Application build? ); # GetOptions() doesn't remove the params from @ARGV if their value was "" @@ -682,8 +683,7 @@ my ($target, $fonts)=@_; # in the app the the layout is different (no .rockbox, but bin/lib/share) - $app = ($modelname eq "application"); - unless ($app) { + unless (($app eq 'yes') && ($install)) { #rbdir starts with '/', strip it $rbdir = substr($rbdir, 1); } Index: tools/root.make =================================================================== --- tools/root.make (revision 29397) +++ tools/root.make (working copy) @@ -251,10 +251,10 @@ $(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC)) fontzip: - $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY) + $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY) zip: - $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) + $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) mapzip: $(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip @@ -263,14 +263,14 @@ $(SILENT)find . -name "*.elf" | xargs zip rockbox-elfs.zip fullzip: - $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY) + $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY) 7zip: - $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) + $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) tar: $(SILENT)rm -f rockbox.tar - $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) + $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY) bzip2: tar $(SILENT)bzip2 -f9 rockbox.tar @@ -305,15 +305,15 @@ install: @echo "Installing your build in your '$(RBPREFIX)' dir" - $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) + $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY) fullinstall: @echo "Installing a full setup in your '$(RBPREFIX)' dir" - $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) + $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) symlinkinstall: @echo "Installing a full setup with links in your '$(RBPREFIX)' dir" - $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) -l + $(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) --app=$(APPLICATION) -m "$(MODELNAME)" -i "$(TARGET_ID)" $(INSTALL) -z "zip -r0" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY) -l endif help: Index: apps/apps.make =================================================================== --- apps/apps.make (revision 29397) +++ apps/apps.make (working copy) @@ -8,9 +8,6 @@ # INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA))) -ifdef APP_TYPE - INCLUDES += -I$(APPSDIR)/hosted -endif SRC += $(call preprocess, $(APPSDIR)/SOURCES) # apps/features.txt is a file that (is preprocessed and) lists named features Index: firmware/export/config.h =================================================================== --- firmware/export/config.h (revision 29397) +++ firmware/export/config.h (working copy) @@ -440,13 +440,21 @@ #include "config/mpiohd200.h" #elif defined(MPIO_HD300) #include "config/mpiohd300.h" +#elif defined(SDLAPP) +#include "config/sdlapp.h" +#elif defined(ANDROID) +#include "config/android.h" +#elif defined(NOKIAN8XX) +#include "config/nokian8xx.h" +#elif defined(NOKIAN900) +#include "config/nokian900.h" +#else +/* no known platform */ +#endif -#elif defined(APPLICATION) -#include "config/application.h" +#ifdef APPLICATION #define CONFIG_CPU 0 #define CONFIG_STORAGE 0 -#else -/* no known platform */ #endif /* keep this include after the target configs */ Index: firmware/export/config/android.h =================================================================== --- firmware/export/config/android.h (revision 29396) +++ firmware/export/config/android.h (working copy) @@ -1,18 +1,11 @@ /* - * This config file is for Rockbox as an application! + * This config file is for Rockbox as an application on Android */ #define TARGET_TREE /* this target is using the target tree system */ /* We don't run on hardware directly */ -#ifdef ANDROID #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID) -#elif MAEMO5 -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5) -#elif MAEMO4 -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4) -#else -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) -#endif + /* For Rolo and boot loader */ #define MODEL_NUMBER 100 @@ -57,9 +50,7 @@ #define LCD_DEPTH 16 #define LCD_PIXELFORMAT 565 -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) #define HAVE_LCD_ENABLE -#endif /* define this to indicate your device's keypad */ #define HAVE_TOUCHSCREEN @@ -79,30 +70,9 @@ /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC -/* Work around debug macro expansion of strncmp in scratchbox */ -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) -#define _HAVE_STRING_ARCH_strncmp -#endif - -#if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO)) #define HAVE_MULTIMEDIA_KEYS -#endif - -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) #define CONFIG_KEYPAD ANDROID_PAD -#elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) -#define HAVE_SCROLLWHEEL -#define CONFIG_KEYPAD SDL_PAD -#else -#error unknown platform -#endif -#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) -/* Use SDL audio/pcm in a SDL app build */ -#define HAVE_SDL -#define HAVE_SDL_AUDIO -#endif - #define HAVE_SW_TONE_CONTROLS /* Define current usage levels. */ Index: firmware/export/config/nokian900.h =================================================================== --- firmware/export/config/nokian900.h (revision 29396) +++ firmware/export/config/nokian900.h (working copy) @@ -1,18 +1,11 @@ /* - * This config file is for Rockbox as an application! + * This config file is for Rockbox as an application on the Nokia N900 */ #define TARGET_TREE /* this target is using the target tree system */ /* We don't run on hardware directly */ -#ifdef ANDROID -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID) -#elif MAEMO5 #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5) -#elif MAEMO4 -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4) -#else -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) -#endif + /* For Rolo and boot loader */ #define MODEL_NUMBER 100 @@ -46,21 +39,11 @@ /* LCD dimensions * * overriden by configure for application builds */ -#ifndef LCD_WIDTH -#define LCD_WIDTH 320 -#endif - -#ifndef LCD_HEIGHT +#define LCD_WIDTH 800 #define LCD_HEIGHT 480 -#endif - #define LCD_DEPTH 16 #define LCD_PIXELFORMAT 565 -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) -#define HAVE_LCD_ENABLE -#endif - /* define this to indicate your device's keypad */ #define HAVE_TOUCHSCREEN #define HAVE_BUTTON_DATA @@ -80,28 +63,15 @@ #define CONFIG_CODEC SWCODEC /* Work around debug macro expansion of strncmp in scratchbox */ -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) #define _HAVE_STRING_ARCH_strncmp -#endif -#if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO)) #define HAVE_MULTIMEDIA_KEYS -#endif - -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) -#define CONFIG_KEYPAD ANDROID_PAD -#elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) #define HAVE_SCROLLWHEEL #define CONFIG_KEYPAD SDL_PAD -#else -#error unknown platform -#endif -#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) /* Use SDL audio/pcm in a SDL app build */ #define HAVE_SDL #define HAVE_SDL_AUDIO -#endif #define HAVE_SW_TONE_CONTROLS Index: firmware/export/config/nokian8xx.h =================================================================== --- firmware/export/config/nokian8xx.h (revision 29396) +++ firmware/export/config/nokian8xx.h (working copy) @@ -1,18 +1,11 @@ /* - * This config file is for Rockbox as an application! + * This config file is for Rockbox as an application on the Nokia N8xx */ #define TARGET_TREE /* this target is using the target tree system */ /* We don't run on hardware directly */ -#ifdef ANDROID -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID) -#elif MAEMO5 -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5) -#elif MAEMO4 #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4) -#else -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) -#endif + /* For Rolo and boot loader */ #define MODEL_NUMBER 100 @@ -43,24 +36,12 @@ /* define this if you would like tagcache to build on this target */ #define HAVE_TAGCACHE -/* LCD dimensions - * - * overriden by configure for application builds */ -#ifndef LCD_WIDTH -#define LCD_WIDTH 320 -#endif - -#ifndef LCD_HEIGHT +/* LCD dimensions */ +#define LCD_WIDTH 800 #define LCD_HEIGHT 480 -#endif - #define LCD_DEPTH 16 #define LCD_PIXELFORMAT 565 -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) -#define HAVE_LCD_ENABLE -#endif - /* define this to indicate your device's keypad */ #define HAVE_TOUCHSCREEN #define HAVE_BUTTON_DATA @@ -80,28 +61,15 @@ #define CONFIG_CODEC SWCODEC /* Work around debug macro expansion of strncmp in scratchbox */ -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) #define _HAVE_STRING_ARCH_strncmp -#endif -#if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO)) #define HAVE_MULTIMEDIA_KEYS -#endif - -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) -#define CONFIG_KEYPAD ANDROID_PAD -#elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) #define HAVE_SCROLLWHEEL #define CONFIG_KEYPAD SDL_PAD -#else -#error unknown platform -#endif -#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) /* Use SDL audio/pcm in a SDL app build */ #define HAVE_SDL #define HAVE_SDL_AUDIO -#endif #define HAVE_SW_TONE_CONTROLS Index: firmware/export/config/application.h =================================================================== --- firmware/export/config/application.h (revision 29397) +++ firmware/export/config/application.h (working copy) @@ -1,129 +0,0 @@ -/* - * This config file is for Rockbox as an application! - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* We don't run on hardware directly */ -#ifdef ANDROID -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID) -#elif MAEMO5 -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5) -#elif MAEMO4 -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4) -#else -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) -#endif -/* For Rolo and boot loader */ -#define MODEL_NUMBER 100 - -#define MODEL_NAME "Rockbox" - -#define USB_NONE - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions - * - * overriden by configure for application builds */ -#ifndef LCD_WIDTH -#define LCD_WIDTH 320 -#endif - -#ifndef LCD_HEIGHT -#define LCD_HEIGHT 480 -#endif - -#define LCD_DEPTH 16 -#define LCD_PIXELFORMAT 565 - -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) -#define HAVE_LCD_ENABLE -#endif - -/* define this to indicate your device's keypad */ -#define HAVE_TOUCHSCREEN -#define HAVE_BUTTON_DATA - -/* define this if you have RTC RAM available for settings */ -//#define HAVE_RTC_RAM - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* Work around debug macro expansion of strncmp in scratchbox */ -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) -#define _HAVE_STRING_ARCH_strncmp -#endif - -#if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO)) -#define HAVE_MULTIMEDIA_KEYS -#endif - -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) -#define CONFIG_KEYPAD ANDROID_PAD -#elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) -#define HAVE_SCROLLWHEEL -#define CONFIG_KEYPAD SDL_PAD -#else -#error unknown platform -#endif - -#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) -/* Use SDL audio/pcm in a SDL app build */ -#define HAVE_SDL -#define HAVE_SDL_AUDIO -#endif - -#define HAVE_SW_TONE_CONTROLS - -/* Define current usage levels. */ -#define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */ -#define CURRENT_BACKLIGHT 30 /* TBD */ -#define CURRENT_RECORD 0 /* no recording yet */ - -/* Define this to the CPU frequency */ -/* -#define CPU_FREQ 48000000 -*/ - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define CONFIG_LCD LCD_COWOND2 - -/* Define this if a programmable hotkey is mapped */ -//#define HAVE_HOTKEY - -#define BOOTDIR "/.rockbox" Index: firmware/export/config/sdlapp.h =================================================================== --- firmware/export/config/sdlapp.h (revision 29396) +++ firmware/export/config/sdlapp.h (working copy) @@ -1,18 +1,11 @@ /* - * This config file is for Rockbox as an application! + * This config file is for the SDL application */ #define TARGET_TREE /* this target is using the target tree system */ /* We don't run on hardware directly */ -#ifdef ANDROID -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID) -#elif MAEMO5 -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5) -#elif MAEMO4 -#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4) -#else #define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) -#endif + /* For Rolo and boot loader */ #define MODEL_NUMBER 100 @@ -57,10 +50,6 @@ #define LCD_DEPTH 16 #define LCD_PIXELFORMAT 565 -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) -#define HAVE_LCD_ENABLE -#endif - /* define this to indicate your device's keypad */ #define HAVE_TOUCHSCREEN #define HAVE_BUTTON_DATA @@ -79,29 +68,12 @@ /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC -/* Work around debug macro expansion of strncmp in scratchbox */ -#if (CONFIG_PLATFORM & PLATFORM_MAEMO) -#define _HAVE_STRING_ARCH_strncmp -#endif - -#if (CONFIG_PLATFORM & (PLATFORM_ANDROID|PLATFORM_MAEMO)) -#define HAVE_MULTIMEDIA_KEYS -#endif - -#if (CONFIG_PLATFORM & PLATFORM_ANDROID) -#define CONFIG_KEYPAD ANDROID_PAD -#elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) #define HAVE_SCROLLWHEEL #define CONFIG_KEYPAD SDL_PAD -#else -#error unknown platform -#endif -#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO)) /* Use SDL audio/pcm in a SDL app build */ #define HAVE_SDL #define HAVE_SDL_AUDIO -#endif #define HAVE_SW_TONE_CONTROLS Index: uisimulator/uisimulator.make =================================================================== --- uisimulator/uisimulator.make (revision 29397) +++ uisimulator/uisimulator.make (working copy) @@ -18,7 +18,7 @@ OTHER_SRC += $(SIMSRC) SIMLIB = $(BUILDDIR)/uisimulator/libuisimulator.a -ifeq ($(MODELNAME), application) +ifeq (yes,$(APPLICATION)) UIBMP= else UIBMP=$(BUILDDIR)/UI256.bmp