devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix win32 simulator builds (tested cross compilation from linux)

Browse source 
- windows linker doesn't support -z defs
- rename 'crosscompile' variable to 'win32crosscompile' to show its real meaning
- do not test which host we are running on if we are cross compiling for win32

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27283 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-07-04 15:02:11 +00:00
parent 79a863b322
commit 94eff1541d
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tools/configure vendored
View file

@ -12,7 +12,7 @@
CCOPTS="-W -Wall -Wundef -O -nostdlib -ffreestanding -Wstrict-prototypes -pipe" CCOPTS="-W -Wall -Wundef -O -nostdlib -ffreestanding -Wstrict-prototypes -pipe"
# global LD options for all platforms # global LD options for all platforms
GLOBAL_LDOPTS="-Wl,-z,defs" GLOBAL_LDOPTS=""
use_logf="#undef ROCKBOX_HAS_LOGF" use_logf="#undef ROCKBOX_HAS_LOGF"
use_bootchart="#undef DO_BOOTCHART" use_bootchart="#undef DO_BOOTCHART"
@ -107,7 +107,7 @@ simcc () {
ARG_ARM_THUMB=0 # can't use thumb in native builds ARG_ARM_THUMB=0 # can't use thumb in native builds
simver=sdl simver=sdl
winbuild="$crosscompile" winbuild=""
GCCOPTS='-W -Wall -g -fno-builtin' GCCOPTS='-W -Wall -g -fno-builtin'
GCCOPTIMIZE='' GCCOPTIMIZE=''
LDOPTS='-lm' # button-sdl.c uses sqrt() LDOPTS='-lm' # button-sdl.c uses sqrt()
@ -118,6 +118,11 @@ simcc () {
# default share option, override below if needed # default share option, override below if needed
SHARED_FLAG="-shared" SHARED_FLAG="-shared"
if [ "$win32crosscompile" = "yes" ]; then
LDOPTS="$LDOPTS -mconsole"
output="rockboxui.exe"
winbuild="yes"
else
case $uname in case $uname in
CYGWIN*) CYGWIN*)
echo "Cygwin host detected" echo "Cygwin host detected"
@ -164,7 +169,9 @@ simcc () {
exit 1 exit 1
;; ;;
esac esac
fi
[ "$winbuild" != "yes" ] && GLOBAL_LDOPTS="$GLOBAL_LDOPTS -Wl,-z,defs"
sdl=`findsdl $winbuild` sdl=`findsdl $winbuild`
if [ $1 = "sdl" ]; then if [ $1 = "sdl" ]; then
@ -182,7 +189,7 @@ simcc () {
GCCOPTS="$GCCOPTS -I\$(SIMDIR)" GCCOPTS="$GCCOPTS -I\$(SIMDIR)"
if test "X$crosscompile" != "Xyes"; then if test "X$win32crosscompile" != "Xyes"; then
case `uname -m` in case `uname -m` in
x86_64|amd64) x86_64|amd64)
# fPIC is needed to make shared objects link # fPIC is needed to make shared objects link
@ -483,7 +490,7 @@ whichadvanced () {
;; ;;
[Ww]) [Ww])
echo "Enabling Windows 32 cross-compiling" echo "Enabling Windows 32 cross-compiling"
crosscompile="yes" win32crosscompile="yes"
;; ;;
*) *)
if [ "$interact" ]; then if [ "$interact" ]; then