summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl/libsdl-1.2.14
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2012-03-14 17:03:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:17:42 +0000
commit3882f40e57510c4806dac36490af84b4f0ff9441 (patch)
treef6d2bd8d060347e975cb7d298324306b3c9b124d /meta/recipes-graphics/libsdl/libsdl-1.2.14
parent897cdb692b27f5f7137ea0a58cdea99d21c66f3f (diff)
downloadpoky-3882f40e57510c4806dac36490af84b4f0ff9441.tar.gz
libsdl: update to 1.2.15
Update libsdl to 1.2.15. Patch add.XGetRequest.symbol.patch is merged by upstream, so remove it. (From OE-Core rev: 94e18a1c574b97ba87724c0fea79d2af77ba4186) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libsdl/libsdl-1.2.14')
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch79
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-1.2.14/configure_tweak.patch1146
2 files changed, 0 insertions, 1225 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch
deleted file mode 100644
index 33ba8ecde9..0000000000
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.14/add.XGetRequest.symbol.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From e49fe9e2d75764d2d7ef79ab4252a1f6b99adcd3 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Thu, 23 Feb 2012 18:38:19 +0100
4Subject: [PATCH] _XGetRequest API was backported to libx11-1.4.4 in:
5 http://git.openembedded.org/openembedded-core/commit/?id=e08604800fe1cb8f240f53c147ceb4ee08a29b91
6
7This breaks e.g. libsdl-image build with:
8| /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libSDL.so: undefined reference to `_XGetRequest'
9
10For details see: https://bugzilla.redhat.com/show_bug.cgi?id=782251
11
12Upstream-Status: Accepted
13---
14 src/video/x11/SDL_x11dyn.c | 24 ++++++++++++++++++++++++
15 src/video/x11/SDL_x11sym.h | 6 ++++++
16 2 files changed, 30 insertions(+), 0 deletions(-)
17
18diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c
19index 4e549b3..a7e800e 100644
20--- a/src/video/x11/SDL_x11dyn.c
21+++ b/src/video/x11/SDL_x11dyn.c
22@@ -109,6 +109,21 @@ char *(*pXGetICValues)(XIC, ...) = NULL;
23 #undef SDL_X11_SYM
24
25
26+static void *SDL_XGetRequest_workaround(Display* dpy, CARD8 type, size_t len)
27+{
28+ xReq *req;
29+ WORD64ALIGN
30+ if (dpy->bufptr + len > dpy->bufmax)
31+ _XFlush(dpy);
32+ dpy->last_req = dpy->bufptr;
33+ req = (xReq*)dpy->bufptr;
34+ req->reqType = type;
35+ req->length = len / 4;
36+ dpy->bufptr += len;
37+ dpy->request++;
38+ return req;
39+}
40+
41 static int x11_load_refcount = 0;
42
43 void SDL_X11_UnloadSymbols(void)
44@@ -168,6 +183,15 @@ int SDL_X11_LoadSymbols(void)
45 X11_GetSym("XGetICValues",&SDL_X11_HAVE_UTF8,(void **)&pXGetICValues);
46 #endif
47
48+ /*
49+ * In case we're built with newer Xlib headers, we need to make sure
50+ * that _XGetRequest() is available, even on older systems.
51+ * Otherwise, various Xlib macros we use will call a NULL pointer.
52+ */
53+ if (!SDL_X11_HAVE_XGETREQUEST) {
54+ p_XGetRequest = SDL_XGetRequest_workaround;
55+ }
56+
57 if (SDL_X11_HAVE_BASEXLIB) { /* all required symbols loaded. */
58 SDL_ClearError();
59 } else {
60diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
61index 3dfa146..f1e7841 100644
62--- a/src/video/x11/SDL_x11sym.h
63+++ b/src/video/x11/SDL_x11sym.h
64@@ -170,6 +170,12 @@ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,
65 #endif
66
67 /*
68+ * libX11 1.4.99.1 added _XGetRequest, and macros use it behind the scenes.
69+ */
70+SDL_X11_MODULE(XGETREQUEST)
71+SDL_X11_SYM(void *,_XGetRequest,(Display* a,CARD8 b,size_t c),(a,b,c),return)
72+
73+/*
74 * These only show up on some variants of Unix.
75 */
76 #if defined(__osf__)
77--
781.7.2.5
79
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.14/configure_tweak.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.14/configure_tweak.patch
deleted file mode 100644
index 07bda6df02..0000000000
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.14/configure_tweak.patch
+++ /dev/null
@@ -1,1146 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- SDL-1.2.14/configure.in.orig 2011-10-18 14:51:32.044167004 +0800
4+++ SDL-1.2.14/configure.in 2011-10-18 14:51:42.374167009 +0800
5@@ -48,9 +48,9 @@
6 dnl AC_CANONICAL_HOST
7 AC_C_BIGENDIAN
8 if test x$ac_cv_c_bigendian = xyes; then
9- AC_DEFINE(SDL_BYTEORDER, 4321)
10+ AC_DEFINE(SDL_BYTEORDER, 4321, "Byte Order")
11 else
12- AC_DEFINE(SDL_BYTEORDER, 1234)
13+ AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order")
14 fi
15
16 dnl Check for tools
17@@ -139,7 +139,7 @@
18 AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]),
19 , enable_libc=yes)
20 if test x$enable_libc = xyes; then
21- AC_DEFINE(HAVE_LIBC)
22+ AC_DEFINE(HAVE_LIBC,1,"")
23
24 dnl Check for C library headers
25 AC_HEADER_STDC
26@@ -150,7 +150,7 @@
27 if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then
28 AC_CHECK_TYPE(int64_t)
29 if test x$ac_cv_type_int64_t = xyes; then
30- AC_DEFINE(SDL_HAS_64BIT_TYPE)
31+ AC_DEFINE(SDL_HAS_64BIT_TYPE,1,"")
32 fi
33 have_inttypes=yes
34 fi
35@@ -166,11 +166,11 @@
36
37 AC_FUNC_MEMCMP
38 if test x$ac_cv_func_memcmp_working = xyes; then
39- AC_DEFINE(HAVE_MEMCMP)
40+ AC_DEFINE(HAVE_MEMCMP,1,"")
41 fi
42 AC_FUNC_STRTOD
43 if test x$ac_cv_func_strtod = xyes; then
44- AC_DEFINE(HAVE_STRTOD)
45+ AC_DEFINE(HAVE_STRTOD,1,"")
46 fi
47 AC_CHECK_FUNC(mprotect,
48 AC_TRY_COMPILE([
49@@ -194,40 +194,40 @@
50 AC_CHECK_SIZEOF(long, 4)
51 AC_CHECK_SIZEOF(long long, 8)
52 if test x$ac_cv_sizeof_char = x1; then
53- AC_DEFINE(int8_t, signed char)
54- AC_DEFINE(uint8_t, unsigned char)
55+ AC_DEFINE(int8_t, signed char,"")
56+ AC_DEFINE(uint8_t, unsigned char,"")
57 fi
58 if test x$ac_cv_sizeof_short = x2; then
59- AC_DEFINE(int16_t, signed short)
60- AC_DEFINE(uint16_t, unsigned short)
61+ AC_DEFINE(int16_t, signed short,"")
62+ AC_DEFINE(uint16_t, unsigned short,"")
63 else
64 if test x$ac_cv_sizeof_int = x2; then
65- AC_DEFINE(int16_t, signed int)
66- AC_DEFINE(uint16_t, unsigned int)
67+ AC_DEFINE(int16_t, signed int,"")
68+ AC_DEFINE(uint16_t, unsigned int,"")
69 fi
70 fi
71 if test x$ac_cv_sizeof_int = x4; then
72- AC_DEFINE(int32_t, signed int)
73- AC_DEFINE(uint32_t, unsigned int)
74+ AC_DEFINE(int32_t, signed int,"")
75+ AC_DEFINE(uint32_t, unsigned int,"")
76 else
77 if test x$ac_cv_sizeof_long = x4; then
78- AC_DEFINE(int32_t, signed long)
79- AC_DEFINE(uint32_t, unsigned long)
80+ AC_DEFINE(int32_t, signed long,"")
81+ AC_DEFINE(uint32_t, unsigned long,"")
82 fi
83 fi
84 if test x$ac_cv_sizeof_long = x8; then
85- AC_DEFINE(int64_t, signed long)
86- AC_DEFINE(uint64_t, unsigned long)
87- AC_DEFINE(SDL_HAS_64BIT_TYPE)
88+ AC_DEFINE(int64_t, signed long,"")
89+ AC_DEFINE(uint64_t, unsigned long,"")
90+ AC_DEFINE(SDL_HAS_64BIT_TYPE,"")
91 else
92 if test x$ac_cv_sizeof_long_long = x8; then
93- AC_DEFINE(int64_t, signed long long)
94- AC_DEFINE(uint64_t, unsigned long long)
95- AC_DEFINE(SDL_HAS_64BIT_TYPE)
96+ AC_DEFINE(int64_t, signed long long,"")
97+ AC_DEFINE(uint64_t, unsigned long long,"")
98+ AC_DEFINE(SDL_HAS_64BIT_TYPE,"")
99 fi
100 fi
101- AC_DEFINE(size_t, unsigned int)
102- AC_DEFINE(uintptr_t, unsigned long)
103+ AC_DEFINE(size_t, unsigned int,"")
104+ AC_DEFINE(uintptr_t, unsigned long,"")
105 fi
106
107 # Standard C sources
108@@ -248,25 +248,25 @@
109 AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]),
110 , enable_audio=yes)
111 if test x$enable_audio != xyes; then
112- AC_DEFINE(SDL_AUDIO_DISABLED)
113+ AC_DEFINE(SDL_AUDIO_DISABLED,1,"")
114 fi
115 AC_ARG_ENABLE(video,
116 AC_HELP_STRING([--enable-video], [Enable the video subsystem [[default=yes]]]),
117 , enable_video=yes)
118 if test x$enable_video != xyes; then
119- AC_DEFINE(SDL_VIDEO_DISABLED)
120+ AC_DEFINE(SDL_VIDEO_DISABLED,1,"")
121 fi
122 AC_ARG_ENABLE(events,
123 AC_HELP_STRING([--enable-events], [Enable the events subsystem [[default=yes]]]),
124 , enable_events=yes)
125 if test x$enable_events != xyes; then
126- AC_DEFINE(SDL_EVENTS_DISABLED)
127+ AC_DEFINE(SDL_EVENTS_DISABLED,1,"")
128 fi
129 AC_ARG_ENABLE(joystick,
130 AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]),
131 , enable_joystick=yes)
132 if test x$enable_joystick != xyes; then
133- AC_DEFINE(SDL_JOYSTICK_DISABLED)
134+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"")
135 else
136 SOURCES="$SOURCES $srcdir/src/joystick/*.c"
137 fi
138@@ -274,43 +274,43 @@
139 AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),
140 , enable_cdrom=yes)
141 if test x$enable_cdrom != xyes; then
142- AC_DEFINE(SDL_CDROM_DISABLED)
143+ AC_DEFINE(SDL_CDROM_DISABLED,1,"")
144 fi
145 AC_ARG_ENABLE(threads,
146 AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]),
147 , enable_threads=yes)
148 if test x$enable_threads != xyes; then
149- AC_DEFINE(SDL_THREADS_DISABLED)
150+ AC_DEFINE(SDL_THREADS_DISABLED,1,"")
151 fi
152 AC_ARG_ENABLE(timers,
153 AC_HELP_STRING([--enable-timers], [Enable the timer subsystem [[default=yes]]]),
154 , enable_timers=yes)
155 if test x$enable_timers != xyes; then
156- AC_DEFINE(SDL_TIMERS_DISABLED)
157+ AC_DEFINE(SDL_TIMERS_DISABLED,1,"")
158 fi
159 AC_ARG_ENABLE(file,
160 AC_HELP_STRING([--enable-file], [Enable the file subsystem [[default=yes]]]),
161 , enable_file=yes)
162 if test x$enable_file != xyes; then
163- AC_DEFINE(SDL_FILE_DISABLED)
164+ AC_DEFINE(SDL_FILE_DISABLED,1,"")
165 fi
166 AC_ARG_ENABLE(loadso,
167 AC_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [[default=yes]]]),
168 , enable_loadso=yes)
169 if test x$enable_loadso != xyes; then
170- AC_DEFINE(SDL_LOADSO_DISABLED)
171+ AC_DEFINE(SDL_LOADSO_DISABLED,1,"")
172 fi
173 AC_ARG_ENABLE(cpuinfo,
174 AC_HELP_STRING([--enable-cpuinfo], [Enable the cpuinfo subsystem [[default=yes]]]),
175 , enable_cpuinfo=yes)
176 if test x$enable_cpuinfo != xyes; then
177- AC_DEFINE(SDL_CPUINFO_DISABLED)
178+ AC_DEFINE(SDL_CPUINFO_DISABLED,1,"")
179 fi
180 AC_ARG_ENABLE(assembly,
181 AC_HELP_STRING([--enable-assembly], [Enable assembly routines [[default=yes]]]),
182 , enable_assembly=yes)
183 if test x$enable_assembly = xyes; then
184- AC_DEFINE(SDL_ASSEMBLY_ROUTINES)
185+ AC_DEFINE(SDL_ASSEMBLY_ROUTINES,1,"")
186 fi
187
188 dnl See if the OSS audio interface is supported
189@@ -338,12 +338,12 @@
190 int arg = SNDCTL_DSP_SETFRAGMENT;
191 ],[
192 have_oss=yes
193- AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H)
194+ AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H,1,"")
195 ])
196 fi
197 AC_MSG_RESULT($have_oss)
198 if test x$have_oss = xyes; then
199- AC_DEFINE(SDL_AUDIO_DRIVER_OSS)
200+ AC_DEFINE(SDL_AUDIO_DRIVER_OSS,1,"")
201 SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c"
202 SOURCES="$SOURCES $srcdir/src/audio/dma/*.c"
203 have_audio=yes
204@@ -363,35 +363,7 @@
205 AC_ARG_ENABLE(alsa,
206 AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]),
207 , enable_alsa=yes)
208- if test x$enable_audio = xyes -a x$enable_alsa = xyes; then
209- AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no)
210- # Restore all flags from before the ALSA detection runs
211- CFLAGS="$alsa_save_CFLAGS"
212- LDFLAGS="$alsa_save_LDFLAGS"
213- LIBS="$alsa_save_LIBS"
214- if test x$have_alsa = xyes; then
215- AC_ARG_ENABLE(alsa-shared,
216-AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
217- , enable_alsa_shared=yes)
218- alsa_lib=[`find_lib "libasound.so.*" "$ALSA_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
219-
220- AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
221- SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
222- EXTRA_CFLAGS="$EXTRA_CFLAGS $ALSA_CFLAGS"
223- if test x$have_loadso != xyes && \
224- test x$enable_alsa_shared = xyes; then
225- AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ALSA loading])
226- fi
227- if test x$have_loadso = xyes && \
228- test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
229- echo "-- dynamic libasound -> $alsa_lib"
230- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib")
231- else
232- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS"
233- fi
234- have_audio=yes
235- fi
236- fi
237+ enable_alsa=no
238 }
239
240 dnl Check whether we want to use IRIX 6.5+ native audio or not
241@@ -410,7 +382,7 @@
242 AC_MSG_RESULT($have_dmedia)
243 # Set up files for the audio library
244 if test x$have_dmedia = xyes; then
245- AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA)
246+ AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA,1,"")
247 SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
248 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
249 have_audio=yes
250@@ -447,7 +419,7 @@
251 AC_MSG_RESULT($have_mme)
252 # Set up files for the audio library
253 if test x$have_mme = xyes; then
254- AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO)
255+ AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO,1,"")
256 SOURCES="$SOURCES $srcdir/src/audio/mme/*.c"
257 EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS"
258 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS"
259@@ -470,7 +442,7 @@
260 , enable_esd_shared=yes)
261 esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
262
263- AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
264+ AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"")
265 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
266 EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS"
267 if test x$have_loadso != xyes && \
268@@ -480,7 +452,7 @@
269 if test x$have_loadso = xyes && \
270 test x$enable_esd_shared = xyes && test x$esd_lib != x; then
271 echo "-- dynamic libesd -> $esd_lib"
272- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib")
273+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "")
274 else
275 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS"
276 fi
277@@ -567,7 +539,7 @@
278 , enable_arts_shared=yes)
279 arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
280
281- AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
282+ AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "")
283 SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
284 EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS"
285 if test x$have_loadso != xyes && \
286@@ -577,7 +549,7 @@
287 if test x$have_loadso = xyes && \
288 test x$enable_arts_shared = xyes && test x$arts_lib != x; then
289 echo "-- dynamic libartsc -> $arts_lib"
290- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib")
291+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"")
292 else
293 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS"
294 fi
295@@ -637,7 +609,7 @@
296 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS"
297 fi
298
299- AC_DEFINE(SDL_AUDIO_DRIVER_NAS)
300+ AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"")
301 SOURCES="$SOURCES $srcdir/src/audio/nas/*.c"
302 EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS"
303 have_audio=yes
304@@ -652,7 +624,7 @@
305 AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]),
306 , enable_diskaudio=yes)
307 if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
308- AC_DEFINE(SDL_AUDIO_DRIVER_DISK)
309+ AC_DEFINE(SDL_AUDIO_DRIVER_DISK,1,"")
310 SOURCES="$SOURCES $srcdir/src/audio/disk/*.c"
311 fi
312 }
313@@ -664,7 +636,7 @@
314 AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]),
315 , enable_dummyaudio=yes)
316 if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then
317- AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY)
318+ AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY,1,"")
319 SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c"
320 fi
321 }
322@@ -680,7 +652,7 @@
323 AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes)
324 if test x$have_mint_falcon_hdr = xyes; then
325 mintaudio=yes
326- AC_DEFINE(SDL_AUDIO_DRIVER_MINT)
327+ AC_DEFINE(SDL_AUDIO_DRIVER_MINT,1,"")
328 SOURCES="$SOURCES $srcdir/src/audio/mint/*.c"
329 SOURCES="$SOURCES $srcdir/src/audio/mint/*.S"
330 have_audio=yes
331@@ -756,7 +728,7 @@
332 AC_PATH_PROG(NASM, nasm)
333 fi
334 if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
335- AC_DEFINE(SDL_HERMES_BLITTERS)
336+ AC_DEFINE(SDL_HERMES_BLITTERS,1,"")
337 SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
338 NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/"
339
340@@ -850,9 +822,9 @@
341 CFLAGS="$save_CFLAGS"
342
343 if test x$have_gcc_altivec = xyes; then
344- AC_DEFINE(SDL_ALTIVEC_BLITTERS)
345+ AC_DEFINE(SDL_ALTIVEC_BLITTERS,1,"")
346 if test x$have_altivec_h_hdr = xyes; then
347- AC_DEFINE(HAVE_ALTIVEC_H)
348+ AC_DEFINE(HAVE_ALTIVEC_H,1,"")
349 fi
350 EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS"
351 fi
352@@ -895,7 +867,7 @@
353
354 if test x$enable_ipod = xyes; then
355 EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
356- AC_DEFINE(SDL_VIDEO_DRIVER_IPOD)
357+ AC_DEFINE(SDL_VIDEO_DRIVER_IPOD,1,"")
358 SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
359 fi
360 }
361@@ -929,7 +901,7 @@
362 EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB"
363 fi
364
365- AC_DEFINE(SDL_VIDEO_DRIVER_NANOX)
366+ AC_DEFINE(SDL_VIDEO_DRIVER_NANOX,1,"")
367 SOURCES="$SOURCES $srcdir/src/video/nanox/*.c"
368 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X"
369 have_video=yes
370@@ -995,7 +967,7 @@
371 CFLAGS="$CFLAGS $X_CFLAGS"
372 LDFLAGS="$LDFLAGS $X_LIBS"
373
374- AC_DEFINE(SDL_VIDEO_DRIVER_X11)
375+ AC_DEFINE(SDL_VIDEO_DRIVER_X11,1,"")
376 SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
377 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
378
379@@ -1017,8 +989,8 @@
380 test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
381 echo "-- dynamic libX11 -> $x11_lib"
382 echo "-- dynamic libX11ext -> $x11ext_lib"
383- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib")
384- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib")
385+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib","")
386+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib","")
387 else
388 enable_x11_shared=no
389 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext"
390@@ -1035,20 +1007,20 @@
391 AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),
392 , enable_video_dga=yes)
393 if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then
394- AC_DEFINE(SDL_VIDEO_DRIVER_DGA)
395+ AC_DEFINE(SDL_VIDEO_DRIVER_DGA,1,"")
396 SOURCES="$SOURCES $srcdir/src/video/dga/*.c"
397 fi
398 AC_ARG_ENABLE(video-x11-dgamouse,
399 AC_HELP_STRING([--enable-video-x11-dgamouse], [use X11 DGA for mouse events [[default=yes]]]),
400 , enable_video_x11_dgamouse=yes)
401 if test x$enable_dga = xyes -a x$enable_video_x11_dgamouse = xyes; then
402- AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE)
403+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE,1,"")
404 fi
405 AC_ARG_ENABLE(video-x11-vm,
406 AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[default=yes]]]),
407 , enable_video_x11_vm=yes)
408 if test x$enable_video_x11_vm = xyes; then
409- AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE)
410+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE,1,"")
411 SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
412 fi
413 AC_ARG_ENABLE(video-x11-xv,
414@@ -1062,14 +1034,14 @@
415 AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
416 , enable_video_x11_xinerama=yes)
417 if test x$enable_video_x11_xinerama = xyes; then
418- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA)
419+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA,1,"")
420 SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c"
421 fi
422 AC_ARG_ENABLE(video-x11-xme,
423 AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]),
424 , enable_video_x11_xme=yes)
425 if test x$enable_video_x11_xme = xyes; then
426- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME)
427+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME,1,"")
428 SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c"
429 fi
430 AC_ARG_ENABLE(video-x11-xrandr,
431@@ -1086,8 +1058,8 @@
432 if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
433 echo "-- dynamic libXrender -> $xrender_lib"
434 echo "-- dynamic libXrandr -> $xrandr_lib"
435- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
436- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib")
437+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib","")
438+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib","")
439 definitely_enable_video_x11_xrandr=yes
440 else
441 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
442@@ -1100,7 +1072,7 @@
443 fi
444 fi
445 if test x$definitely_enable_video_x11_xrandr = xyes; then
446- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
447+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"")
448 fi
449 fi
450 fi
451@@ -1127,7 +1099,7 @@
452 ])
453 AC_MSG_RESULT($video_photon)
454 if test x$video_photon = xyes; then
455- AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON)
456+ AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON,1,"")
457 SOURCES="$SOURCES $srcdir/src/video/photon/*.c"
458 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph"
459 have_video=yes
460@@ -1141,7 +1113,7 @@
461 CheckBWINDOW()
462 {
463 if test x$enable_video = xyes; then
464- AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW)
465+ AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW,1,"")
466 SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
467 have_video=yes
468 fi
469@@ -1164,7 +1136,7 @@
470 ])
471 AC_MSG_RESULT($have_carbon)
472 if test x$have_carbon = xyes; then
473- AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX)
474+ AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX,1,"")
475 SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c"
476 SOURCES="$SOURCES $srcdir/src/video/macrom/*.c"
477 have_video=yes
478@@ -1193,7 +1165,7 @@
479 AC_MSG_RESULT($have_cocoa)
480 CFLAGS="$save_CFLAGS"
481 if test x$have_cocoa = xyes; then
482- AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ)
483+ AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ,1,"")
484 SOURCES="$SOURCES $srcdir/src/video/quartz/*.m"
485 have_video=yes
486 fi
487@@ -1220,7 +1192,7 @@
488 AC_MSG_RESULT($video_fbcon)
489 if test x$video_fbcon = xyes; then
490 AC_CHECK_FUNCS(getpagesize)
491- AC_DEFINE(SDL_VIDEO_DRIVER_FBCON)
492+ AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"")
493 SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c"
494 have_video=yes
495 fi
496@@ -1271,7 +1243,7 @@
497 AC_MSG_RESULT($video_directfb)
498
499 if test x$video_directfb = xyes; then
500- AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB)
501+ AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB,1,"")
502 SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
503 EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
504 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
505@@ -1298,7 +1270,7 @@
506 ])
507 AC_MSG_RESULT($video_ps2gs)
508 if test x$video_ps2gs = xyes; then
509- AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS)
510+ AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS,1,"")
511 SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c"
512 have_video=yes
513 fi
514@@ -1350,7 +1322,7 @@
515 ])
516 AC_MSG_RESULT($video_ggi)
517 if test x$video_ggi = xyes; then
518- AC_DEFINE(SDL_VIDEO_DRIVER_GGI)
519+ AC_DEFINE(SDL_VIDEO_DRIVER_GGI,1,"")
520 SOURCES="$SOURCES $srcdir/src/video/ggi/*.c"
521 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg"
522 have_video=yes
523@@ -1380,7 +1352,7 @@
524 ])
525 AC_MSG_RESULT($video_svga)
526 if test x$video_svga = xyes; then
527- AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB)
528+ AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB,1,"")
529 SOURCES="$SOURCES $srcdir/src/video/svga/*.c"
530 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga"
531 have_video=yes
532@@ -1412,7 +1384,7 @@
533 ])
534 AC_MSG_RESULT($video_vgl)
535 if test x$video_vgl = xyes; then
536- AC_DEFINE(SDL_VIDEO_DRIVER_VGL)
537+ AC_DEFINE(SDL_VIDEO_DRIVER_VGL,1,"")
538 SOURCES="$SOURCES $srcdir/src/video/vgl/*.c"
539 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl"
540 have_video=yes
541@@ -1440,7 +1412,7 @@
542 ])
543 AC_MSG_RESULT($video_wscons)
544 if test x$video_wscons = xyes; then
545- AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS)
546+ AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS,1,"")
547 SOURCES="$SOURCES $srcdir/src/video/wscons/*.c"
548 have_video=yes
549 fi
550@@ -1465,7 +1437,7 @@
551 ])
552 AC_MSG_RESULT($video_aalib)
553 if test x$video_aalib = xyes; then
554- AC_DEFINE(SDL_VIDEO_DRIVER_AALIB)
555+ AC_DEFINE(SDL_VIDEO_DRIVER_AALIB,1,"")
556 SOURCES="$SOURCES $srcdir/src/video/aalib/*.c"
557 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa"
558 have_video=yes
559@@ -1527,7 +1499,7 @@
560 CXXFLAGS="$OLD_CXX"
561 AC_MSG_RESULT($video_qtopia)
562 if test x$video_qtopia = xyes; then
563- AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA)
564+ AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA,1,"")
565 SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc"
566 SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc"
567 EXTRA_CFLAGS="$EXTRA_CFLAGS $QTOPIA_FLAGS"
568@@ -1556,7 +1528,7 @@
569 ])
570 AC_MSG_RESULT($video_picogui)
571 if test x$video_picogui = xyes; then
572- AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI)
573+ AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI,1,"")
574 SOURCES="$SOURCES $srcdir/src/video/picogui/*.c"
575 SDL_LIBS="$SDL_LIBS -lpgui"
576 have_video=yes
577@@ -1580,7 +1552,7 @@
578 video_xbios=no
579 if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then
580 video_xbios=yes
581- AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS)
582+ AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS,1,"")
583 SOURCES="$SOURCES $srcdir/src/video/xbios/*.c"
584 have_video=yes
585 fi
586@@ -1598,7 +1570,7 @@
587 AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes)
588 if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then
589 video_gem=yes
590- AC_DEFINE(SDL_VIDEO_DRIVER_GEM)
591+ AC_DEFINE(SDL_VIDEO_DRIVER_GEM,1,"")
592 SOURCES="$SOURCES $srcdir/src/video/gem/*.c"
593 SDL_LIBS="$SDL_LIBS -lgem"
594 have_video=yes
595@@ -1613,7 +1585,7 @@
596 AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]),
597 , enable_video_dummy=yes)
598 if test x$enable_video_dummy = xyes; then
599- AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY)
600+ AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY,1,"")
601 SOURCES="$SOURCES $srcdir/src/video/dummy/*.c"
602 have_video=yes
603 fi
604@@ -1640,8 +1612,8 @@
605 ])
606 AC_MSG_RESULT($video_opengl)
607 if test x$video_opengl = xyes; then
608- AC_DEFINE(SDL_VIDEO_OPENGL)
609- AC_DEFINE(SDL_VIDEO_OPENGL_GLX)
610+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
611+ AC_DEFINE(SDL_VIDEO_OPENGL_GLX,1,"")
612 fi
613 fi
614 }
615@@ -1660,7 +1632,7 @@
616 ])
617 AC_MSG_RESULT($video_opengl)
618 if test x$video_opengl = xyes; then
619- AC_DEFINE(SDL_VIDEO_OPENGL)
620+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
621 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
622 fi
623 fi
624@@ -1670,8 +1642,8 @@
625 CheckWIN32GL()
626 {
627 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
628- AC_DEFINE(SDL_VIDEO_OPENGL)
629- AC_DEFINE(SDL_VIDEO_OPENGL_WGL)
630+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
631+ AC_DEFINE(SDL_VIDEO_OPENGL_WGL,1,"")
632 fi
633 }
634
635@@ -1679,7 +1651,7 @@
636 CheckBeGL()
637 {
638 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
639- AC_DEFINE(SDL_VIDEO_OPENGL)
640+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
641 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
642 fi
643 }
644@@ -1688,7 +1660,7 @@
645 CheckMacGL()
646 {
647 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
648- AC_DEFINE(SDL_VIDEO_OPENGL)
649+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
650 case "$host" in
651 *-*-darwin*)
652 if test x$enable_video_cocoa = xyes; then
653@@ -1720,8 +1692,8 @@
654 OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags`
655 OSMESA_LIBS=`$OSMESA_CONFIG --libs`
656 fi
657- AC_DEFINE(SDL_VIDEO_OPENGL)
658- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA)
659+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
660+ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA,1,"")
661 SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS"
662 SDL_LIBS="$SDL_LIBS $OSMESA_LIBS"
663
664@@ -1731,7 +1703,7 @@
665 if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then
666 # Dynamic linking
667 if test "x$have_osmesa_hdr" = "xyes"; then
668- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC)
669+ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC,1,"")
670 fi
671 fi
672 fi
673@@ -1765,7 +1737,7 @@
674 ])
675 AC_MSG_RESULT($use_input_events)
676 if test x$use_input_events = xyes; then
677- AC_DEFINE(SDL_INPUT_LINUXEV)
678+ AC_DEFINE(SDL_INPUT_LINUXEV,1,"")
679 fi
680 fi
681 }
682@@ -1787,7 +1759,7 @@
683 ])
684 AC_MSG_RESULT($enable_input_tslib)
685 if test x$enable_input_tslib = xyes; then
686- AC_DEFINE(SDL_INPUT_TSLIB)
687+ AC_DEFINE(SDL_INPUT_TSLIB,1,"")
688 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts"
689 fi
690 fi
691@@ -1810,7 +1782,7 @@
692 AC_MSG_CHECKING(pth)
693 AC_MSG_RESULT($use_pth)
694 if test "x$use_pth" = xyes; then
695- AC_DEFINE(SDL_THREAD_PTH)
696+ AC_DEFINE(SDL_THREAD_PTH,1,"")
697 SOURCES="$SOURCES $srcdir/src/thread/pth/*.c"
698 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c"
699 SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`"
700@@ -1916,7 +1888,7 @@
701
702 # Do futher testing if we have pthread support...
703 if test x$use_pthreads = xyes; then
704- AC_DEFINE(SDL_THREAD_PTHREAD)
705+ AC_DEFINE(SDL_THREAD_PTHREAD,1,"")
706 EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags"
707 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib"
708 SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags"
709@@ -1938,7 +1910,7 @@
710 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
711 ],[
712 has_recursive_mutexes=yes
713- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX)
714+ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX,1,"")
715 ])
716 fi
717 if test x$has_recursive_mutexes = xno; then
718@@ -1949,7 +1921,7 @@
719 pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
720 ],[
721 has_recursive_mutexes=yes
722- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP)
723+ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP,1,"")
724 ])
725 fi
726 AC_MSG_RESULT($has_recursive_mutexes)
727@@ -2024,7 +1996,7 @@
728 fi
729
730 if test x$enable_video = xyes; then
731- AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB)
732+ AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB,1,"")
733 SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c"
734 SOURCES="$SOURCES $srcdir/src/video/windib/*.c"
735 have_video=yes
736@@ -2046,7 +2018,7 @@
737 have_directx=yes
738 fi
739 if test x$enable_video = xyes -a x$have_directx = xyes; then
740- AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW)
741+ AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW,1,"")
742 SOURCES="$SOURCES $srcdir/src/video/windx5/*.c"
743 have_video=yes
744 fi
745@@ -2077,7 +2049,7 @@
746 AC_CHECK_LIB(c, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS",
747 AC_CHECK_LIB(dl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl",
748 AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl")))
749- AC_DEFINE(SDL_LOADSO_DLOPEN)
750+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"")
751 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
752 have_loadso=yes
753 fi
754@@ -2094,7 +2066,7 @@
755 AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes)
756 AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem)
757 if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then
758- AC_DEFINE(SDL_LOADSO_LDG)
759+ AC_DEFINE(SDL_LOADSO_LDG,1,"")
760 SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c"
761 SDL_LIBS="$SDL_LIBS -lldg -lgem"
762 have_loadso=yes
763@@ -2225,11 +2197,11 @@
764 have_machine_joystick=yes
765 ])
766 if test x$have_machine_joystick = xyes; then
767- AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H)
768+ AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H,1,"")
769 fi
770 AC_MSG_RESULT($have_machine_joystick)
771
772- AC_DEFINE(SDL_JOYSTICK_USBHID)
773+ AC_DEFINE(SDL_JOYSTICK_USBHID,1,"")
774 SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
775 EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
776 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
777@@ -2248,7 +2220,7 @@
778 if test x$enable_clock_gettime = xyes; then
779 AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
780 if test x$have_clock_gettime = xyes; then
781- AC_DEFINE(HAVE_CLOCK_GETTIME)
782+ AC_DEFINE(HAVE_CLOCK_GETTIME,1,"")
783 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
784 fi
785 fi
786@@ -2279,7 +2251,7 @@
787 CheckIPod
788 # Set up files for the timer library
789 if test x$enable_timers = xyes; then
790- AC_DEFINE(SDL_TIMER_UNIX)
791+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
792 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
793 have_timers=yes
794 fi
795@@ -2345,17 +2317,17 @@
796 if test x$enable_audio = xyes; then
797 case $ARCH in
798 sysv5|solaris|hpux)
799- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO)
800+ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"")
801 SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
802 have_audio=yes
803 ;;
804 netbsd|openbsd)
805- AC_DEFINE(SDL_AUDIO_DRIVER_BSD)
806+ AC_DEFINE(SDL_AUDIO_DRIVER_BSD,1,"")
807 SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c"
808 have_audio=yes
809 ;;
810 aix)
811- AC_DEFINE(SDL_AUDIO_DRIVER_PAUD)
812+ AC_DEFINE(SDL_AUDIO_DRIVER_PAUD,1,"")
813 SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c"
814 have_audio=yes
815 ;;
816@@ -2365,7 +2337,7 @@
817 if test x$enable_joystick = xyes; then
818 case $ARCH in
819 linux)
820- AC_DEFINE(SDL_JOYSTICK_LINUX)
821+ AC_DEFINE(SDL_JOYSTICK_LINUX,1,"")
822 SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c"
823 have_joystick=yes
824 ;;
825@@ -2375,32 +2347,32 @@
826 if test x$enable_cdrom = xyes; then
827 case $ARCH in
828 linux|solaris)
829- AC_DEFINE(SDL_CDROM_LINUX)
830+ AC_DEFINE(SDL_CDROM_LINUX,1,"")
831 SOURCES="$SOURCES $srcdir/src/cdrom/linux/*.c"
832 have_cdrom=yes
833 ;;
834 *freebsd*)
835- AC_DEFINE(SDL_CDROM_FREEBSD)
836+ AC_DEFINE(SDL_CDROM_FREEBSD,1,"")
837 SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c"
838 have_cdrom=yes
839 ;;
840 *openbsd*|*netbsd*)
841- AC_DEFINE(SDL_CDROM_OPENBSD)
842+ AC_DEFINE(SDL_CDROM_OPENBSD,1,"")
843 SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c"
844 have_cdrom=yes
845 ;;
846 bsdi)
847- AC_DEFINE(SDL_CDROM_BSDI)
848+ AC_DEFINE(SDL_CDROM_BSDI,1,"")
849 SOURCES="$SOURCES $srcdir/src/cdrom/bsdi/*.c"
850 have_cdrom=yes
851 ;;
852 aix)
853- AC_DEFINE(SDL_CDROM_AIX)
854+ AC_DEFINE(SDL_CDROM_AIX,1,"")
855 SOURCES="$SOURCES $srcdir/src/cdrom/aix/*.c"
856 have_cdrom=yes
857 ;;
858 osf)
859- AC_DEFINE(SDL_CDROM_OSF)
860+ AC_DEFINE(SDL_CDROM_OSF,1,"")
861 SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c"
862 have_cdrom=yes
863 ;;
864@@ -2408,7 +2380,7 @@
865 fi
866 # Set up files for the thread library
867 if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
868- AC_DEFINE(SDL_THREAD_SPROC)
869+ AC_DEFINE(SDL_THREAD_SPROC,1,"")
870 SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
871 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
872 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
873@@ -2416,7 +2388,7 @@
874 fi
875 # Set up files for the timer library
876 if test x$enable_timers = xyes; then
877- AC_DEFINE(SDL_TIMER_UNIX)
878+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
879 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
880 have_timers=yes
881 fi
882@@ -2435,20 +2407,20 @@
883 CheckPTHREAD
884 # Set up files for the audio library
885 if test x$enable_audio = xyes; then
886- AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO)
887+ AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO,1,"")
888 SOURCES="$SOURCES $srcdir/src/audio/nto/*.c"
889 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
890 have_audio=yes
891 fi
892 # Set up files for the cdrom library
893 if test x$enable_cdrom = xyes; then
894- AC_DEFINE(SDL_CDROM_QNX)
895+ AC_DEFINE(SDL_CDROM_QNX,1,"")
896 SOURCES="$SOURCES $srcdir/src/cdrom/qnx/*.c"
897 have_cdrom=yes
898 fi
899 # Set up files for the timer library
900 if test x$enable_timers = xyes; then
901- AC_DEFINE(SDL_TIMER_UNIX)
902+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
903 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
904 have_timers=yes
905 fi
906@@ -2473,29 +2445,29 @@
907 CheckNASM
908 # Set up files for the audio library
909 if test x$enable_audio = xyes; then
910- AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT)
911+ AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT,1,"")
912 SOURCES="$SOURCES $srcdir/src/audio/windib/*.c"
913 if test x$have_directx = xyes; then
914- AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)
915+ AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND,1,"")
916 SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c"
917 fi
918 have_audio=yes
919 fi
920 # Set up files for the joystick library
921 if test x$enable_joystick = xyes; then
922- AC_DEFINE(SDL_JOYSTICK_WINMM)
923+ AC_DEFINE(SDL_JOYSTICK_WINMM,1,"")
924 SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c"
925 have_joystick=yes
926 fi
927 # Set up files for the cdrom library
928 if test x$enable_cdrom = xyes; then
929- AC_DEFINE(SDL_CDROM_WIN32)
930+ AC_DEFINE(SDL_CDROM_WIN32,1,"")
931 SOURCES="$SOURCES $srcdir/src/cdrom/win32/*.c"
932 have_cdrom=yes
933 fi
934 # Set up files for the thread library
935 if test x$enable_threads = xyes; then
936- AC_DEFINE(SDL_THREAD_WIN32)
937+ AC_DEFINE(SDL_THREAD_WIN32,1,"")
938 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
939 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
940 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
941@@ -2504,13 +2476,13 @@
942 fi
943 # Set up files for the timer library
944 if test x$enable_timers = xyes; then
945- AC_DEFINE(SDL_TIMER_WIN32)
946+ AC_DEFINE(SDL_TIMER_WIN32,1,"")
947 SOURCES="$SOURCES $srcdir/src/timer/win32/*.c"
948 have_timers=yes
949 fi
950 # Set up files for the shared object loading library
951 if test x$enable_loadso = xyes; then
952- AC_DEFINE(SDL_LOADSO_WIN32)
953+ AC_DEFINE(SDL_LOADSO_WIN32,1,"")
954 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
955 have_loadso=yes
956 fi
957@@ -2579,25 +2551,25 @@
958 CheckBeGL
959 # Set up files for the audio library
960 if test x$enable_audio = xyes; then
961- AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO)
962+ AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO,1,"")
963 SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc"
964 have_audio=yes
965 fi
966 # Set up files for the joystick library
967 if test x$enable_joystick = xyes; then
968- AC_DEFINE(SDL_JOYSTICK_BEOS)
969+ AC_DEFINE(SDL_JOYSTICK_BEOS,1,"")
970 SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc"
971 have_joystick=yes
972 fi
973 # Set up files for the cdrom library
974 if test x$enable_cdrom = xyes; then
975- AC_DEFINE(SDL_CDROM_BEOS)
976+ AC_DEFINE(SDL_CDROM_BEOS,1,"")
977 SOURCES="$SOURCES $srcdir/src/cdrom/beos/*.cc"
978 have_cdrom=yes
979 fi
980 # Set up files for the thread library
981 if test x$enable_threads = xyes; then
982- AC_DEFINE(SDL_THREAD_BEOS)
983+ AC_DEFINE(SDL_THREAD_BEOS,1,"")
984 SOURCES="$SOURCES $srcdir/src/thread/beos/*.c"
985 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
986 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
987@@ -2605,7 +2577,7 @@
988 fi
989 # Set up files for the timer library
990 if test x$enable_timers = xyes; then
991- AC_DEFINE(SDL_TIMER_BEOS)
992+ AC_DEFINE(SDL_TIMER_BEOS,1,"")
993 SOURCES="$SOURCES $srcdir/src/timer/beos/*.c"
994 have_timers=yes
995 fi
996@@ -2613,11 +2585,11 @@
997 if test x$enable_loadso = xyes; then
998 case "$host" in
999 *-*-beos*)
1000- AC_DEFINE(SDL_LOADSO_BEOS)
1001+ AC_DEFINE(SDL_LOADSO_BEOS,1,"")
1002 SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
1003 ;;
1004 *-*-haiku*)
1005- AC_DEFINE(SDL_LOADSO_DLOPEN)
1006+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"")
1007 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
1008 ;;
1009 esac
1010@@ -2653,7 +2625,7 @@
1011 # Set up files for the shared object loading library
1012 # (this needs to be done before the dynamic X11 check)
1013 if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
1014- AC_DEFINE(SDL_LOADSO_DLCOMPAT)
1015+ AC_DEFINE(SDL_LOADSO_DLCOMPAT,1,"")
1016 SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
1017 have_loadso=yes
1018 fi
1019@@ -2671,26 +2643,26 @@
1020
1021 # Set up files for the audio library
1022 if test x$enable_audio = xyes; then
1023- AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO)
1024+ AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"")
1025 SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c"
1026 have_audio=yes
1027 fi
1028 # Set up files for the joystick library
1029 if test x$enable_joystick = xyes; then
1030- AC_DEFINE(SDL_JOYSTICK_IOKIT)
1031+ AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"")
1032 SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c"
1033 have_joystick=yes
1034 need_iokit_framework=yes
1035 fi
1036 # Set up files for the cdrom library
1037 if test x$enable_cdrom = xyes; then
1038- AC_DEFINE(SDL_CDROM_MACOSX)
1039+ AC_DEFINE(SDL_CDROM_MACOSX,1,"")
1040 SOURCES="$SOURCES $srcdir/src/cdrom/macosx/*.c"
1041 have_cdrom=yes
1042 fi
1043 # Set up files for the timer library
1044 if test x$enable_timers = xyes; then
1045- AC_DEFINE(SDL_TIMER_UNIX)
1046+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
1047 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
1048 have_timers=yes
1049 fi
1050@@ -2731,30 +2703,30 @@
1051 # Set up files for the audio library
1052 if test x$enable_threads = xyes -a x$enable_pth = xyes; then
1053 if test x$enable_audio = xyes; then
1054- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO)
1055+ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"")
1056 SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
1057 have_audio=yes
1058 fi
1059 fi
1060 # Set up files for the joystick library
1061 if test x$enable_joystick = xyes; then
1062- AC_DEFINE(SDL_JOYSTICK_MINT)
1063+ AC_DEFINE(SDL_JOYSTICK_MINT,1,"")
1064 SOURCES="$SOURCES $srcdir/src/joystick/mint/*.c"
1065 have_joystick=yes
1066 fi
1067 # Set up files for the cdrom library
1068 if test x$enable_cdrom = xyes; then
1069- AC_DEFINE(SDL_CDROM_MINT)
1070+ AC_DEFINE(SDL_CDROM_MINT,1,"")
1071 SOURCES="$SOURCES $srcdir/src/cdrom/mint/*.c"
1072 have_cdrom=yes
1073 fi
1074 # Set up files for the timer library
1075 if test x$enable_timers = xyes; then
1076 if test x$enable_threads = xyes -a x$enable_pth = xyes; then
1077- AC_DEFINE(SDL_TIMER_UNIX)
1078+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
1079 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
1080 else
1081- AC_DEFINE(SDL_TIMER_MINT)
1082+ AC_DEFINE(SDL_TIMER_MIN,1,""T)
1083 SOURCES="$SOURCES $srcdir/src/timer/mint/*.c"
1084 SOURCES="$SOURCES $srcdir/src/timer/mint/*.S"
1085 fi
1086@@ -2767,20 +2739,20 @@
1087 CheckPTHREAD
1088 # Set up files for the video library
1089 if test x$enable_video = xyes; then
1090- AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS)
1091+ AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS,1,"")
1092 SOURCES="$SOURCES $srcdir/src/video/riscos/*.c"
1093 SOURCES="$SOURCES $srcdir/src/video/riscos/*.S"
1094 have_video=yes
1095 fi
1096 # Set up files for the joystick library
1097 if test x$enable_joystick = xyes; then
1098- AC_DEFINE(SDL_JOYSTICK_RISCOS)
1099+ AC_DEFINE(SDL_JOYSTICK_RISCOS,1,"")
1100 SOURCES="$SOURCES $srcdir/src/joystick/riscos/*.c"
1101 have_joystick=yes
1102 fi
1103 # Set up files for the timer library
1104 if test x$enable_timers = xyes; then
1105- AC_DEFINE(SDL_TIMER_RISCOS)
1106+ AC_DEFINE(SDL_TIMER_RISCOS,1,"")
1107 SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c"
1108 have_timers=yes
1109 fi
1110@@ -2799,31 +2771,31 @@
1111 if test x$enable_joystick = xyes; then
1112 if test x$have_joystick != xyes; then
1113 # Wants joystick subsystem, but doesn't have a platform-specific backend...
1114- AC_DEFINE(SDL_JOYSTICK_DUMMY)
1115+ AC_DEFINE(SDL_JOYSTICK_DUMMY,1,"")
1116 SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
1117 fi
1118 fi
1119 if test x$have_cdrom != xyes; then
1120 if test x$enable_cdrom = xyes; then
1121- AC_DEFINE(SDL_CDROM_DISABLED)
1122+ AC_DEFINE(SDL_CDROM_DISABLED,1,"")
1123 fi
1124 SOURCES="$SOURCES $srcdir/src/cdrom/dummy/*.c"
1125 fi
1126 if test x$have_threads != xyes; then
1127 if test x$enable_threads = xyes; then
1128- AC_DEFINE(SDL_THREADS_DISABLED)
1129+ AC_DEFINE(SDL_THREADS_DISABLED,1,"")
1130 fi
1131 SOURCES="$SOURCES $srcdir/src/thread/generic/*.c"
1132 fi
1133 if test x$have_timers != xyes; then
1134 if test x$enable_timers = xyes; then
1135- AC_DEFINE(SDL_TIMERS_DISABLED)
1136+ AC_DEFINE(SDL_TIMERS_DISABLED,1,"")
1137 fi
1138 SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c"
1139 fi
1140 if test x$have_loadso != xyes; then
1141 if test x$enable_loadso = xyes; then
1142- AC_DEFINE(SDL_LOADSO_DISABLED)
1143+ AC_DEFINE(SDL_LOADSO_DISABLED,1,"")
1144 fi
1145 SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c"
1146 fi
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 21:02:10 +0000