From 376c9f3ad0c257ee97d7eba03962f232e85b36a7 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sun, 27 Feb 2011 11:37:39 +0000 Subject: FS#11966 - use separate modelnames and config files for RaaA. This adds an APPLICATION define that can be used in Makefiles, and target-name defines (-DSDLAPP, -DANDROID, -DNOKIAN8XX and -DNOKIAN900) for use elsewhere. LCD size is now hard-coded for the Nokia builds in their config files. A new --app parameter is passed to buildzip.pl to explicitly state that this is an application build - it was previously derived from the model name. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29418 a1c6a512-1295-4272-9138-f99709370657 --- apps/apps.make | 3 - firmware/export/config.h | 16 +++-- firmware/export/config/android.h | 99 +++++++++++++++++++++++++++ firmware/export/config/application.h | 129 ----------------------------------- firmware/export/config/nokian8xx.h | 97 ++++++++++++++++++++++++++ firmware/export/config/nokian900.h | 99 +++++++++++++++++++++++++++ firmware/export/config/sdlapp.h | 101 +++++++++++++++++++++++++++ tools/buildzip.pl | 3 +- tools/configure | 45 ++++++------ tools/root.make | 16 ++--- uisimulator/uisimulator.make | 2 +- 11 files changed, 441 insertions(+), 169 deletions(-) create mode 100644 firmware/export/config/android.h delete mode 100644 firmware/export/config/application.h create mode 100644 firmware/export/config/nokian8xx.h create mode 100644 firmware/export/config/nokian900.h create mode 100644 firmware/export/config/sdlapp.h diff --git a/apps/apps.make b/apps/apps.make index a430288870..6afcd12b5c 100644 --- a/apps/apps.make +++ b/apps/apps.make @@ -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 diff --git a/firmware/export/config.h b/firmware/export/config.h index a870e5d815..1783cc137d 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -440,13 +440,21 @@ Lyre prototype 1 */ #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 */ diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h new file mode 100644 index 0000000000..db214d28b1 --- /dev/null +++ b/firmware/export/config/android.h @@ -0,0 +1,99 @@ +/* + * 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 */ +#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_ANDROID) + +/* 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 + +#define HAVE_LCD_ENABLE + +/* 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 + +#define HAVE_MULTIMEDIA_KEYS +#define CONFIG_KEYPAD ANDROID_PAD + +#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" diff --git a/firmware/export/config/application.h b/firmware/export/config/application.h deleted file mode 100644 index 0aa4a3f54d..0000000000 --- a/firmware/export/config/application.h +++ /dev/null @@ -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" diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h new file mode 100644 index 0000000000..328d73145f --- /dev/null +++ b/firmware/export/config/nokian8xx.h @@ -0,0 +1,97 @@ +/* + * 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 */ +#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO4) + +/* 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 */ +#define LCD_WIDTH 800 +#define LCD_HEIGHT 480 +#define LCD_DEPTH 16 +#define LCD_PIXELFORMAT 565 + +/* 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 */ +#define _HAVE_STRING_ARCH_strncmp + +#define HAVE_MULTIMEDIA_KEYS +#define HAVE_SCROLLWHEEL +#define CONFIG_KEYPAD SDL_PAD + +/* Use SDL audio/pcm in a SDL app build */ +#define HAVE_SDL +#define HAVE_SDL_AUDIO + +#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" diff --git a/firmware/export/config/nokian900.h b/firmware/export/config/nokian900.h new file mode 100644 index 0000000000..a65dc7260b --- /dev/null +++ b/firmware/export/config/nokian900.h @@ -0,0 +1,99 @@ +/* + * 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 */ +#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_MAEMO5) + +/* 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 */ +#define LCD_WIDTH 800 +#define LCD_HEIGHT 480 +#define LCD_DEPTH 16 +#define LCD_PIXELFORMAT 565 + +/* 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 */ +#define _HAVE_STRING_ARCH_strncmp + +#define HAVE_MULTIMEDIA_KEYS +#define HAVE_SCROLLWHEEL +#define CONFIG_KEYPAD SDL_PAD + +/* Use SDL audio/pcm in a SDL app build */ +#define HAVE_SDL +#define HAVE_SDL_AUDIO + +#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" diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h new file mode 100644 index 0000000000..ef2710c999 --- /dev/null +++ b/firmware/export/config/sdlapp.h @@ -0,0 +1,101 @@ +/* + * 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 */ +#define CONFIG_PLATFORM (PLATFORM_HOSTED|PLATFORM_SDL) + +/* 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 + +/* 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 + +#define HAVE_SCROLLWHEEL +#define CONFIG_KEYPAD SDL_PAD + +/* Use SDL audio/pcm in a SDL app build */ +#define HAVE_SDL +#define HAVE_SDL_AUDIO + +#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" diff --git a/tools/buildzip.pl b/tools/buildzip.pl index 0d8f7117a5..2337dbe729 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl @@ -214,6 +214,7 @@ GetOptions ( 'r|root=s' => \$ROOT, 'install=s' => \$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 "" @@ -681,8 +682,6 @@ $year+=1900; sub runone { my ($target, $fonts)=@_; - $app = ($modelname eq "application"); - # Strip the leading / from $rbdir unless we are installing an application # build - the layout is different (no .rockbox, but bin/lib/share) unless ($app && $install) { diff --git a/tools/configure b/tools/configure index 23fef9c968..904e676e9e 100755 --- a/tools/configure +++ b/tools/configure @@ -26,7 +26,6 @@ libdir= sharedir= thread_support="ASSEMBLER_THREADS" -app_modelname= app_lcd_width= app_lcd_height= # @@ -610,7 +609,6 @@ androidcc () { 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 @@ fi ;; 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 @@ fi ;; 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 @@ fi bmp2rb_native="$rootdir/tools/bmp2rb -f 4" output="librockbox.so" bootoutput="librockbox.so" - appextra="recorder:gui:radio" + appextra="recorder:gui:radio:hosted" plugins="yes" swcodec="yes" # architecture, manufacturer and model for the target-tree build @@ -2955,12 +2953,11 @@ fi ;; 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 @@ fi ;; 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 @@ if [ -z "$debug" ]; then 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 @@ fi 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 @@ sed > Makefile \ -e "s<@TOOLSDIR@<${toolsdir}