diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/configure b/tools/configure index c7185f0982..85736d5735 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -12,7 +12,7 @@ | |||
12 | CCOPTS="-W -Wall -Wundef -O -nostdlib -ffreestanding -Wstrict-prototypes -pipe" | 12 | CCOPTS="-W -Wall -Wundef -O -nostdlib -ffreestanding -Wstrict-prototypes -pipe" |
13 | 13 | ||
14 | # global LD options for all platforms | 14 | # global LD options for all platforms |
15 | GLOBAL_LDOPTS="-Wl,-z,defs" | 15 | GLOBAL_LDOPTS="" |
16 | 16 | ||
17 | use_logf="#undef ROCKBOX_HAS_LOGF" | 17 | use_logf="#undef ROCKBOX_HAS_LOGF" |
18 | use_bootchart="#undef DO_BOOTCHART" | 18 | use_bootchart="#undef DO_BOOTCHART" |
@@ -107,7 +107,7 @@ simcc () { | |||
107 | ARG_ARM_THUMB=0 # can't use thumb in native builds | 107 | ARG_ARM_THUMB=0 # can't use thumb in native builds |
108 | 108 | ||
109 | simver=sdl | 109 | simver=sdl |
110 | winbuild="$crosscompile" | 110 | winbuild="" |
111 | GCCOPTS='-W -Wall -g -fno-builtin' | 111 | GCCOPTS='-W -Wall -g -fno-builtin' |
112 | GCCOPTIMIZE='' | 112 | GCCOPTIMIZE='' |
113 | LDOPTS='-lm' # button-sdl.c uses sqrt() | 113 | LDOPTS='-lm' # button-sdl.c uses sqrt() |
@@ -118,6 +118,11 @@ simcc () { | |||
118 | # default share option, override below if needed | 118 | # default share option, override below if needed |
119 | SHARED_FLAG="-shared" | 119 | SHARED_FLAG="-shared" |
120 | 120 | ||
121 | if [ "$win32crosscompile" = "yes" ]; then | ||
122 | LDOPTS="$LDOPTS -mconsole" | ||
123 | output="rockboxui.exe" | ||
124 | winbuild="yes" | ||
125 | else | ||
121 | case $uname in | 126 | case $uname in |
122 | CYGWIN*) | 127 | CYGWIN*) |
123 | echo "Cygwin host detected" | 128 | echo "Cygwin host detected" |
@@ -164,7 +169,9 @@ simcc () { | |||
164 | exit 1 | 169 | exit 1 |
165 | ;; | 170 | ;; |
166 | esac | 171 | esac |
172 | fi | ||
167 | 173 | ||
174 | [ "$winbuild" != "yes" ] && GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs" | ||
168 | sdl=`findsdl $winbuild` | 175 | sdl=`findsdl $winbuild` |
169 | 176 | ||
170 | if [ $1 = "sdl" ]; then | 177 | if [ $1 = "sdl" ]; then |
@@ -182,7 +189,7 @@ simcc () { | |||
182 | 189 | ||
183 | GCCOPTS="$GCCOPTS -I\$(SIMDIR)" | 190 | GCCOPTS="$GCCOPTS -I\$(SIMDIR)" |
184 | 191 | ||
185 | if test "X$crosscompile" != "Xyes"; then | 192 | if test "X$win32crosscompile" != "Xyes"; then |
186 | case `uname -m` in | 193 | case `uname -m` in |
187 | x86_64|amd64) | 194 | x86_64|amd64) |
188 | # fPIC is needed to make shared objects link | 195 | # fPIC is needed to make shared objects link |
@@ -483,7 +490,7 @@ whichadvanced () { | |||
483 | ;; | 490 | ;; |
484 | [Ww]) | 491 | [Ww]) |
485 | echo "Enabling Windows 32 cross-compiling" | 492 | echo "Enabling Windows 32 cross-compiling" |
486 | crosscompile="yes" | 493 | win32crosscompile="yes" |
487 | ;; | 494 | ;; |
488 | *) | 495 | *) |
489 | if [ "$interact" ]; then | 496 | if [ "$interact" ]; then |