diff options
Diffstat (limited to 'tools/configure')
-rwxr-xr-x | tools/configure | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tools/configure b/tools/configure index 504540505d..9f7c63f569 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -103,7 +103,7 @@ simcc () { | |||
103 | prefixtools "$CROSS_COMPILE" | 103 | prefixtools "$CROSS_COMPILE" |
104 | ARG_ARM_THUMB=0 # can't use thumb in native builds | 104 | ARG_ARM_THUMB=0 # can't use thumb in native builds |
105 | 105 | ||
106 | simver=sdl | 106 | app_type=$1 |
107 | winbuild="" | 107 | winbuild="" |
108 | GCCOPTS='-W -Wall -g -fno-builtin' | 108 | GCCOPTS='-W -Wall -g -fno-builtin' |
109 | GCCOPTIMIZE='' | 109 | GCCOPTIMIZE='' |
@@ -171,7 +171,7 @@ simcc () { | |||
171 | [ "$winbuild" != "yes" ] && GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" | 171 | [ "$winbuild" != "yes" ] && GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" |
172 | sdl=`findsdl $winbuild` | 172 | sdl=`findsdl $winbuild` |
173 | 173 | ||
174 | if [ $1 = "sdl" ]; then | 174 | if [ -n `echo $app_type | grep "sdl"` ]; then |
175 | if [ -z "$sdl" ]; then | 175 | if [ -z "$sdl" ]; then |
176 | echo "configure didn't find sdl-config, which indicates that you" | 176 | echo "configure didn't find sdl-config, which indicates that you" |
177 | echo "don't have SDL (properly) installed. Please correct and" | 177 | echo "don't have SDL (properly) installed. Please correct and" |
@@ -233,9 +233,11 @@ EOF | |||
233 | echo "WARNING: Cross Compiling, cannot detect endianess. Assuming little endian!" | 233 | echo "WARNING: Cross Compiling, cannot detect endianess. Assuming little endian!" |
234 | fi | 234 | fi |
235 | 235 | ||
236 | if [ $1 = "sdl" ]; then | 236 | if [ "$app_type" = "sdl-sim" ]; then |
237 | echo "Simulator environment deemed $endian endian" | 237 | echo "Simulator environment deemed $endian endian" |
238 | elif [ $1 = "checkwps" ]; then | 238 | elif [ "$app_type" = "sdl-app" ]; then |
239 | echo "Application environment deemed $endian endian" | ||
240 | elif [ "$app_type" = "checkwps" ]; then | ||
239 | echo "CheckWPS environment deemed $endian endian" | 241 | echo "CheckWPS environment deemed $endian endian" |
240 | fi | 242 | fi |
241 | 243 | ||
@@ -2604,7 +2606,7 @@ fi | |||
2604 | target="-DAPPLICATION" | 2606 | target="-DAPPLICATION" |
2605 | memory=32 | 2607 | memory=32 |
2606 | uname=`uname` | 2608 | uname=`uname` |
2607 | simcc "sdl" | 2609 | simcc "sdl-app" |
2608 | tool="cp " | 2610 | tool="cp " |
2609 | boottool="cp " | 2611 | boottool="cp " |
2610 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" | 2612 | bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" |
@@ -2855,7 +2857,7 @@ uname=`uname` | |||
2855 | 2857 | ||
2856 | if [ "yes" = "$simulator" ]; then | 2858 | if [ "yes" = "$simulator" ]; then |
2857 | # setup compiler and things for simulator | 2859 | # setup compiler and things for simulator |
2858 | simcc "sdl" | 2860 | simcc "sdl-sim" |
2859 | 2861 | ||
2860 | if [ -d "simdisk" ]; then | 2862 | if [ -d "simdisk" ]; then |
2861 | echo "Subdirectory 'simdisk' already present" | 2863 | echo "Subdirectory 'simdisk' already present" |
@@ -3136,7 +3138,7 @@ sed > Makefile \ | |||
3136 | -e "s<@FIRMDIR@<${firmdir}<g" \ | 3138 | -e "s<@FIRMDIR@<${firmdir}<g" \ |
3137 | -e "s<@TOOLSDIR@<${toolsdir}<g" \ | 3139 | -e "s<@TOOLSDIR@<${toolsdir}<g" \ |
3138 | -e "s<@APPS@<${apps}<g" \ | 3140 | -e "s<@APPS@<${apps}<g" \ |
3139 | -e "s<@SIMVER@<${simver}<g" \ | 3141 | -e "s<@APP_TYPE@<${app_type}<g" \ |
3140 | -e "s<@GCCVER@<${gccver}<g" \ | 3142 | -e "s<@GCCVER@<${gccver}<g" \ |
3141 | -e "s<@GCCNUM@<${gccnum}<g" \ | 3143 | -e "s<@GCCNUM@<${gccnum}<g" \ |
3142 | -e "s<@UNAME@<${uname}<g" \ | 3144 | -e "s<@UNAME@<${uname}<g" \ |
@@ -3202,7 +3204,7 @@ export DLLWRAP=@DLLWRAP@ | |||
3202 | export RANLIB=@RANLIB@ | 3204 | export RANLIB=@RANLIB@ |
3203 | export PREFIX=@PREFIX@ | 3205 | export PREFIX=@PREFIX@ |
3204 | export PROFILE_OPTS=@PROFILE_OPTS@ | 3206 | export PROFILE_OPTS=@PROFILE_OPTS@ |
3205 | export SIMVER=@SIMVER@ | 3207 | export APP_TYPE=@APP_TYPE@ |
3206 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl | 3208 | export SIMDIR=\$(ROOTDIR)/uisimulator/sdl |
3207 | export GCCOPTS=@GCCOPTS@ | 3209 | export GCCOPTS=@GCCOPTS@ |
3208 | export TARGET_INC=@TARGET_INC@ | 3210 | export TARGET_INC=@TARGET_INC@ |