diff options
| author | Teruaki Kawashima <teru@rockbox.org> | 2010-10-14 13:10:12 +0000 |
|---|---|---|
| committer | Teruaki Kawashima <teru@rockbox.org> | 2010-10-14 13:10:12 +0000 |
| commit | 900ec8d9441fab73d092e2582a15730978f20758 (patch) | |
| tree | 1468eb7a7bc4384df7aee81cf796b8923db52507 | |
| parent | 6c9db4c4c4a479f7de00245dd37dfe6676a9d8b5 (diff) | |
fix option handling in configure for application. also tries to "make reconf" work, but realpath reports error...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28280 a1c6a512-1295-4272-9138-f99709370657
| -rwxr-xr-x | tools/configure | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tools/configure b/tools/configure index e716439ca2..5f148d892c 100755 --- a/tools/configure +++ b/tools/configure @@ -56,7 +56,7 @@ app_get_platform() { if [ -z "$ARG_PLATFORM" ]; then choice=`input` else - choice="$APP_PLATFORM" + choice="$ARG_PLATFORM" fi case $choice in @@ -69,7 +69,7 @@ app_get_platform() { if [ -z "$ARG_LCDWIDTH" ]; then app_lcd_width=`input` else - app_lcd_width=`$ARG_LCDWIDTH` + app_lcd_width="$ARG_LCDWIDTH" fi if [ -z "$app_lcd_width" ]; then app_lcd_width="320"; fi echo "Enter the LCD height (default: 480)" @@ -80,6 +80,8 @@ app_get_platform() { fi if [ -z "$app_lcd_height" ]; then app_lcd_height="480"; fi echo "Selected $app_lcd_width x $app_lcd_height resolution" + ARG_LCDWIDTH=$app_lcd_width + ARG_LCDHEIGHT=$app_lcd_height app_lcd_width="#define LCD_WIDTH $app_lcd_width" app_lcd_height="#define LCD_HEIGHT $app_lcd_height" @@ -3227,6 +3229,14 @@ fi if [ "$ARG_ARM_EABI" = "1" ]; then cmdline="$cmdline--eabi " fi +if [ "$app_platform" = "sdl" ]; then + cmdline="$cmdline--platform=S " +elif [ "$app_platform" = "android" ]; then + cmdline="$cmdline--platform=A " +fi +if [ "$modelname" = "application" ]; then + cmdline="$cmdline--lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT " +fi cmdline="$cmdline--target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts --prefix=\$(PREFIX)" ### end of cmdline |