diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/configure b/tools/configure index 324e7a3cc2..39b8d18a6e 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -42,9 +42,9 @@ crosswincc () { | |||
42 | 42 | ||
43 | prefixtools i586-mingw32msvc- | 43 | prefixtools i586-mingw32msvc- |
44 | 44 | ||
45 | LDOPTS="-lgdi32 -luser32 -mwindows" | ||
46 | # add cross-compiler option(s) | 45 | # add cross-compiler option(s) |
47 | GCCOPTS="$GCCOPTS -mno-cygwin" | 46 | GCCOPTS="$GCCOPTS `sdl-config --cflags`" |
47 | LDOPTS="`sdl-config --libs` -mconsole" | ||
48 | 48 | ||
49 | output="rockboxui.exe" # use this as output binary name | 49 | output="rockboxui.exe" # use this as output binary name |
50 | crosscompile="yes" | 50 | crosscompile="yes" |
@@ -129,13 +129,13 @@ simcc () { | |||
129 | 129 | ||
130 | Linux) | 130 | Linux) |
131 | echo "Linux host detected" | 131 | echo "Linux host detected" |
132 | GCCOPTS="$GCCOPTS" | ||
133 | if [ "0" != `sdl-config --libs |grep -c mwindows` ]; then | 132 | if [ "0" != `sdl-config --libs |grep -c mwindows` ]; then |
134 | # Enable crosscompiling if sdl-config is from Windows SDL | 133 | # Enable crosscompiling if sdl-config is from Windows SDL |
135 | crosswincc | 134 | crosswincc |
135 | else | ||
136 | GCCOPTS="$GCCOPTS `sdl-config --cflags`" | ||
137 | LDOPTS="`sdl-config --libs`" | ||
136 | fi | 138 | fi |
137 | GCCOPTS="$GCCOPTS `sdl-config --cflags`" | ||
138 | LDOPTS="`sdl-config --libs`" | ||
139 | ;; | 139 | ;; |
140 | 140 | ||
141 | FreeBSD) | 141 | FreeBSD) |
@@ -159,16 +159,16 @@ simcc () { | |||
159 | ;; | 159 | ;; |
160 | esac | 160 | esac |
161 | 161 | ||
162 | if [ "`uname -m`" = "x86_64" ] || [ "`uname -m`" = "amd64" ]; then | ||
163 | # fPIC is needed to make shared objects link | ||
164 | # setting visibility to hidden is necessary to avoid strange crashes | ||
165 | # due to symbol clashing | ||
166 | GCCOPTS="$GCCOPTS -fPIC -fvisibility=hidden" | ||
167 | fi | ||
168 | |||
169 | GCCOPTS="$GCCOPTS -I\$(SIMDIR)" | 162 | GCCOPTS="$GCCOPTS -I\$(SIMDIR)" |
170 | 163 | ||
171 | if test "X$crosscompile" != "Xyes"; then | 164 | if test "X$crosscompile" != "Xyes"; then |
165 | if [ "`uname -m`" = "x86_64" ] || [ "`uname -m`" = "amd64" ]; then | ||
166 | # fPIC is needed to make shared objects link | ||
167 | # setting visibility to hidden is necessary to avoid strange crashes | ||
168 | # due to symbol clashing | ||
169 | GCCOPTS="$GCCOPTS -fPIC -fvisibility=hidden" | ||
170 | fi | ||
171 | |||
172 | id=$$ | 172 | id=$$ |
173 | cat >/tmp/conftest-$id.c <<EOF | 173 | cat >/tmp/conftest-$id.c <<EOF |
174 | #include <stdio.h> | 174 | #include <stdio.h> |