diff options
| author | Barry Wardell <rockbox@barrywardell.net> | 2006-09-29 20:04:36 +0000 |
|---|---|---|
| committer | Barry Wardell <rockbox@barrywardell.net> | 2006-09-29 20:04:36 +0000 |
| commit | ce74dc074355dcf8db9bd0c09ee2624089d3c3e7 (patch) | |
| tree | 423ac7b5e98b4d7754e48b950160f638471c4ac8 /tools | |
| parent | 64f949f2954db85968850f6e157e5c3b10df6b7d (diff) | |
| download | rockbox-ce74dc074355dcf8db9bd0c09ee2624089d3c3e7.zip rockbox-ce74dc074355dcf8db9bd0c09ee2624089d3c3e7.tar.gz rockbox-ce74dc074355dcf8db9bd0c09ee2624089d3c3e7.tar.bz2 rockbox-ce74dc074355dcf8db9bd0c09ee2624089d3c3e7.tar.xz | |
Cleaner implementation of the recent OSX simulator build fix. No need to define SHARED_FLAG in each Makefile. Just have configure create it in the root Makefile instead.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11095 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/configure | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/configure b/tools/configure index b83b8c7..bbbdc50 100755 --- a/tools/configure +++ b/tools/configure @@ -103,6 +103,7 @@ simcc () { CYGWIN*) echo "Cygwin host detected" + SHARED_FLAG="-shared" if [ "$simver" = "win32" ]; then # win32 version GCCOPTS="$GCCOPTS -mno-cygwin -DNOCYGWIN" @@ -124,6 +125,7 @@ simcc () { Linux) echo "Linux host detected" GCCOPTS="$GCCOPTS" + SHARED_FLAG="-shared" if [ "$simver" = "win32" ]; then LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread' crosswincc # setup cross-compiler @@ -144,6 +146,7 @@ simcc () { FreeBSD) echo "FreeBSD host detected" LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -dl -lpthread' + SHARED_FLAG="-shared" if [ "$simver" = "win32" ]; then crosswincc # setup cross-compiler fi @@ -154,6 +157,7 @@ simcc () { # sdl version GCCOPTS="$GCCOPTS `sdl-config --cflags`" LDOPTS="`sdl-config --libs`" + SHARED_FLAG="-dynamiclib -Wl\,-single_module" use_simsound="#define ROCKBOX_HAS_SIMSOUND 1" echo "Enabled PCM sound playback in simulator" ;; @@ -1359,6 +1363,7 @@ sed > Makefile \ -e "s,@PLUGINS@,${plugins},g" \ -e "s,@CODECS@,${codecs},g" \ -e "s,@PROFILE_OPTS@,${PROFILE_OPTS},g" \ + -e "s,@SHARED_FLAG@,${SHARED_FLAG},g" \ -e "s,@GCCOPTS@,${GCCOPTS},g" \ -e "s,@TARGET_INC@,${TARGET_INC},g" \ -e "s!@LDOPTS@!${LDOPTS}!g" \ @@ -1429,6 +1434,7 @@ export TARGET_INC=@TARGET_INC@ export LOADADDRESS=@LOADADDRESS@ export SIMVER=@SIMVER@ export SIMDIR=\$(ROOTDIR)/uisimulator/\$(SIMVER) +export SHARED_FLAG=@SHARED_FLAG@ export LDOPTS=@LDOPTS@ export GCCVER=@GCCVER@ export GCCNUM=@GCCNUM@ |