summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTeruaki Kawashima <teru@rockbox.org>2010-10-14 13:10:12 +0000
committerTeruaki Kawashima <teru@rockbox.org>2010-10-14 13:10:12 +0000
commit900ec8d9441fab73d092e2582a15730978f20758 (patch)
tree1468eb7a7bc4384df7aee81cf796b8923db52507 /tools
parent6c9db4c4c4a479f7de00245dd37dfe6676a9d8b5 (diff)
downloadrockbox-900ec8d9441fab73d092e2582a15730978f20758.tar.gz
rockbox-900ec8d9441fab73d092e2582a15730978f20758.zip
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/configure14
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() {
56 if [ -z "$ARG_PLATFORM" ]; then 56 if [ -z "$ARG_PLATFORM" ]; then
57 choice=`input` 57 choice=`input`
58 else 58 else
59 choice="$APP_PLATFORM" 59 choice="$ARG_PLATFORM"
60 fi 60 fi
61 61
62 case $choice in 62 case $choice in
@@ -69,7 +69,7 @@ app_get_platform() {
69 if [ -z "$ARG_LCDWIDTH" ]; then 69 if [ -z "$ARG_LCDWIDTH" ]; then
70 app_lcd_width=`input` 70 app_lcd_width=`input`
71 else 71 else
72 app_lcd_width=`$ARG_LCDWIDTH` 72 app_lcd_width="$ARG_LCDWIDTH"
73 fi 73 fi
74 if [ -z "$app_lcd_width" ]; then app_lcd_width="320"; fi 74 if [ -z "$app_lcd_width" ]; then app_lcd_width="320"; fi
75 echo "Enter the LCD height (default: 480)" 75 echo "Enter the LCD height (default: 480)"
@@ -80,6 +80,8 @@ app_get_platform() {
80 fi 80 fi
81 if [ -z "$app_lcd_height" ]; then app_lcd_height="480"; fi 81 if [ -z "$app_lcd_height" ]; then app_lcd_height="480"; fi
82 echo "Selected $app_lcd_width x $app_lcd_height resolution" 82 echo "Selected $app_lcd_width x $app_lcd_height resolution"
83 ARG_LCDWIDTH=$app_lcd_width
84 ARG_LCDHEIGHT=$app_lcd_height
83 85
84 app_lcd_width="#define LCD_WIDTH $app_lcd_width" 86 app_lcd_width="#define LCD_WIDTH $app_lcd_width"
85 app_lcd_height="#define LCD_HEIGHT $app_lcd_height" 87 app_lcd_height="#define LCD_HEIGHT $app_lcd_height"
@@ -3227,6 +3229,14 @@ fi
3227if [ "$ARG_ARM_EABI" = "1" ]; then 3229if [ "$ARG_ARM_EABI" = "1" ]; then
3228 cmdline="$cmdline--eabi " 3230 cmdline="$cmdline--eabi "
3229fi 3231fi
3232if [ "$app_platform" = "sdl" ]; then
3233 cmdline="$cmdline--platform=S "
3234elif [ "$app_platform" = "android" ]; then
3235 cmdline="$cmdline--platform=A "
3236fi
3237if [ "$modelname" = "application" ]; then
3238 cmdline="$cmdline--lcdwidth=$ARG_LCDWIDTH --lcdheight=$ARG_LCDHEIGHT "
3239fi
3230 3240
3231cmdline="$cmdline--target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts --prefix=\$(PREFIX)" 3241cmdline="$cmdline--target=\$(MODELNAME) --ram=\$(MEMORYSIZE) --rbdir=\$(RBDIR) --type=$btype$advopts --prefix=\$(PREFIX)"
3232### end of cmdline 3242### end of cmdline