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
diff --git a/apps/apps.make b/apps/apps.make
index a430288..6afcd12 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 a870e5d..1783cc1 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -440,15 +440,23 @@
#include "config/mpiohd200.h"
#elif defined(MPIO_HD300)
#include "config/mpiohd300.h"
-
-#elif defined(APPLICATION)
-#include "config/application.h"
-#define CONFIG_CPU 0
-#define CONFIG_STORAGE 0
+#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
+#ifdef APPLICATION
+#define CONFIG_CPU 0
+#define CONFIG_STORAGE 0
+#endif
+
/* keep this include after the target configs */
#ifdef SIMULATOR
#include "config/sim.h"
diff --git a/firmware/export/config/application.h b/firmware/export/config/android.h
similarity index 72%
copy from firmware/export/config/application.h
copy to firmware/export/config/android.h
index 0aa4a3f..db214d2 100644
--- a/firmware/export/config/application.h
+++ b/firmware/export/config/android.h
@@ -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,29 +70,8 @@
/* 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
diff --git a/firmware/export/config/application.h b/firmware/export/config/nokian8xx.h
similarity index 73%
copy from firmware/export/config/application.h
copy to firmware/export/config/nokian8xx.h
index 0aa4a3f..328d731 100644
--- a/firmware/export/config/application.h
+++ b/firmware/export/config/nokian8xx.h
@@ -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
diff --git a/firmware/export/config/application.h b/firmware/export/config/nokian900.h
similarity index 75%
rename from firmware/export/config/application.h
rename to firmware/export/config/nokian900.h
index 0aa4a3f..a65dc72 100644
--- a/firmware/export/config/application.h
+++ b/firmware/export/config/nokian900.h
@@ -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
diff --git a/firmware/export/config/application.h b/firmware/export/config/sdlapp.h
similarity index 73%
copy from firmware/export/config/application.h
copy to firmware/export/config/sdlapp.h
index 0aa4a3f..ef2710c 100644
--- a/firmware/export/config/application.h
+++ b/firmware/export/config/sdlapp.h
@@ -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
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 0d8f711..2337dbe 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -214,6 +214,7 @@
'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 @@
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 23fef9c..904e676 100755
--- a/tools/configure
+++ b/tools/configure
@@ -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="yes"
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}<g" \
-e "s<@APPS@<${apps}<g" \
-e "s<@APP_TYPE@<${app_type}<g" \
+ -e "s<@APPLICATION@<${application}<g" \
-e "s<@GCCVER@<${gccver}<g" \
-e "s<@GCCNUM@<${gccnum}<g" \
-e "s<@UNAME@<${uname}<g" \
@@ -3630,6 +3630,7 @@
export PREFIX=@PREFIX@
export PROFILE_OPTS=@PROFILE_OPTS@
export APP_TYPE=@APP_TYPE@
+export APPLICATION=@APPLICATION@
export SIMDIR=\$(ROOTDIR)/uisimulator/sdl
export GCCOPTS=@GCCOPTS@
export TARGET_INC=@TARGET_INC@
diff --git a/tools/root.make b/tools/root.make
index 0640ba5..85a996f 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -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:
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make
index dcbd799..d30a9db 100644
--- a/uisimulator/uisimulator.make
+++ b/uisimulator/uisimulator.make
@@ -18,7 +18,7 @@
OTHER_SRC += $(SIMSRC)
SIMLIB = $(BUILDDIR)/uisimulator/libuisimulator.a
-ifeq ($(MODELNAME), application)
+ifeq (yes,$(APPLICATION))
UIBMP=
else
UIBMP=$(BUILDDIR)/UI256.bmp