diff options
Diffstat (limited to 'tools/configure')
-rwxr-xr-x | tools/configure | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/tools/configure b/tools/configure index 042080ff94..0e960f9304 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -80,6 +80,11 @@ simcc () { | |||
80 | # win32 version | 80 | # win32 version |
81 | GCCOPTS="$GCCOPTS -mno-cygwin -DNOCYGWIN" | 81 | GCCOPTS="$GCCOPTS -mno-cygwin -DNOCYGWIN" |
82 | LDOPTS="-lgdi32 -luser32 -mno-cygwin" | 82 | LDOPTS="-lgdi32 -luser32 -mno-cygwin" |
83 | elif [ "$simver" = "sdl" ]; then | ||
84 | # sdl version | ||
85 | GCCOPTS="$GCCOPTS `sdl-config --cflags`" | ||
86 | LDOPTS="`sdl-config --libs`" | ||
87 | checksoundcard | ||
83 | else | 88 | else |
84 | # x11 version | 89 | # x11 version |
85 | GCCOPTS="$GCCOPTS" | 90 | GCCOPTS="$GCCOPTS" |
@@ -92,10 +97,15 @@ simcc () { | |||
92 | Linux) | 97 | Linux) |
93 | echo "Linux host detected" | 98 | echo "Linux host detected" |
94 | GCCOPTS="$GCCOPTS" | 99 | GCCOPTS="$GCCOPTS" |
95 | LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread' | ||
96 | if [ "$simver" = "win32" ]; then | 100 | if [ "$simver" = "win32" ]; then |
101 | LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread' | ||
97 | crosswincc # setup cross-compiler | 102 | crosswincc # setup cross-compiler |
103 | elif [ "$simver" = "sdl" ]; then | ||
104 | GCCOPTS="$GCCOPTS `sdl-config --cflags`" | ||
105 | LDOPTS="`sdl-config --libs`" | ||
106 | checksoundcard | ||
98 | else | 107 | else |
108 | LDOPTS='-L/usr/X11R6/lib -lX11 -lm -lXt -lXmu -lnsl -ldl -lpthread' | ||
99 | checksoundcard | 109 | checksoundcard |
100 | fi # not a cross-compiler | 110 | fi # not a cross-compiler |
101 | ;; | 111 | ;; |
@@ -247,7 +257,7 @@ if [ -z "$simver" ]; then | |||
247 | # Figure out win32/x11 GUI | 257 | # Figure out win32/x11 GUI |
248 | # | 258 | # |
249 | echo "" | 259 | echo "" |
250 | echo "Build (W)in32 or (X)11 GUI version? (X)" | 260 | echo "Build (W)in32 or (X)11 or (S)DL GUI version? (S)" |
251 | 261 | ||
252 | option=`input`; | 262 | option=`input`; |
253 | 263 | ||
@@ -262,8 +272,13 @@ if [ -z "$simver" ]; then | |||
262 | # make sure the code knows this is for win32 | 272 | # make sure the code knows this is for win32 |
263 | extradefines="$extradefines -DWIN32" | 273 | extradefines="$extradefines -DWIN32" |
264 | ;; | 274 | ;; |
265 | *) | 275 | [Xx]) |
266 | simver="x11" | 276 | simver="x11" |
277 | extradefines="$extradefines -DX11" | ||
278 | ;; | ||
279 | [Ss]|*) | ||
280 | simver="sdl" | ||
281 | extradefines="$extradefines -DSDL" | ||
267 | ;; | 282 | ;; |
268 | esac | 283 | esac |
269 | echo "Selected $simver simulator" | 284 | echo "Selected $simver simulator" |