diff options
Diffstat (limited to 'tools/configure')
-rwxr-xr-x | tools/configure | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/tools/configure b/tools/configure index c7c75a2593..e716439ca2 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -53,7 +53,12 @@ prefixtools () { | |||
53 | 53 | ||
54 | app_get_platform() { | 54 | app_get_platform() { |
55 | echo "Select your platform: (S)DL, (A)ndroid (default: Android)" | 55 | echo "Select your platform: (S)DL, (A)ndroid (default: Android)" |
56 | choice=`input` | 56 | if [ -z "$ARG_PLATFORM" ]; then |
57 | choice=`input` | ||
58 | else | ||
59 | choice="$APP_PLATFORM" | ||
60 | fi | ||
61 | |||
57 | case $choice in | 62 | case $choice in |
58 | s|S*) app_platform="sdl" ;; | 63 | s|S*) app_platform="sdl" ;; |
59 | *|a|A*) app_platform="android" ;; | 64 | *|a|A*) app_platform="android" ;; |
@@ -61,10 +66,18 @@ app_get_platform() { | |||
61 | 66 | ||
62 | echo "Selected $app_platform platform" | 67 | echo "Selected $app_platform platform" |
63 | echo "Enter the LCD width (default: 320)" | 68 | echo "Enter the LCD width (default: 320)" |
64 | app_lcd_width=`input` | 69 | if [ -z "$ARG_LCDWIDTH" ]; then |
70 | app_lcd_width=`input` | ||
71 | else | ||
72 | app_lcd_width=`$ARG_LCDWIDTH` | ||
73 | fi | ||
65 | if [ -z "$app_lcd_width" ]; then app_lcd_width="320"; fi | 74 | if [ -z "$app_lcd_width" ]; then app_lcd_width="320"; fi |
66 | echo "Enter the LCD height (default: 480)" | 75 | echo "Enter the LCD height (default: 480)" |
67 | app_lcd_height=`input` | 76 | if [ -z "$ARG_LCDHEIGHT" ]; then |
77 | app_lcd_height=`input` | ||
78 | else | ||
79 | app_lcd_height="$ARG_LCDHEIGHT" | ||
80 | fi | ||
68 | if [ -z "$app_lcd_height" ]; then app_lcd_height="480"; fi | 81 | if [ -z "$app_lcd_height" ]; then app_lcd_height="480"; fi |
69 | echo "Selected $app_lcd_width x $app_lcd_height resolution" | 82 | echo "Selected $app_lcd_width x $app_lcd_height resolution" |
70 | 83 | ||
@@ -945,6 +958,9 @@ for arg in "$@"; do | |||
945 | --no-ccache) ARG_CCACHE=0;; | 958 | --no-ccache) ARG_CCACHE=0;; |
946 | --encopts=*) ARG_ENCOPTS=`echo "$arg" | cut -d = -f 2`;; | 959 | --encopts=*) ARG_ENCOPTS=`echo "$arg" | cut -d = -f 2`;; |
947 | --language=*) ARG_LANG=`echo "$arg" | cut -d = -f 2`;; | 960 | --language=*) ARG_LANG=`echo "$arg" | cut -d = -f 2`;; |
961 | --lcdwidth=*) ARG_LCDWIDTH=`echo "$arg" | cut -d = -f 2`;; | ||
962 | --lcdheight=*) ARG_LCDHEIGHT=`echo "$arg" | cut -d = -f 2`;; | ||
963 | --platform=*) ARG_PLATFORM=`echo "$arg" | cut -d = -f 2`;; | ||
948 | --ram=*) ARG_RAM=`echo "$arg" | cut -d = -f 2`;; | 964 | --ram=*) ARG_RAM=`echo "$arg" | cut -d = -f 2`;; |
949 | --rbdir=*) ARG_RBDIR=`echo "$arg" | cut -d = -f 2`;; | 965 | --rbdir=*) ARG_RBDIR=`echo "$arg" | cut -d = -f 2`;; |
950 | --target=*) ARG_TARGET=`echo "$arg" | cut -d = -f 2`;; | 966 | --target=*) ARG_TARGET=`echo "$arg" | cut -d = -f 2`;; |
@@ -956,7 +972,7 @@ for arg in "$@"; do | |||
956 | --no-eabi) ARG_ARM_EABI=0;; | 972 | --no-eabi) ARG_ARM_EABI=0;; |
957 | --thumb) ARG_ARM_THUMB=1;; | 973 | --thumb) ARG_ARM_THUMB=1;; |
958 | --no-thumb) ARG_ARM_THUMB=0;; | 974 | --no-thumb) ARG_ARM_THUMB=0;; |
959 | --prefix=*) PREFIX=`echo "$arg" | cut -d = -f 2`;; | 975 | --prefix=*) PREFIX=`echo "$arg" | cut -d = -f 2`;; |
960 | --help) help;; | 976 | --help) help;; |
961 | *) err=1; echo "[ERROR] Option '$arg' unsupported";; | 977 | *) err=1; echo "[ERROR] Option '$arg' unsupported";; |
962 | esac | 978 | esac |