diff options
Diffstat (limited to 'meta/recipes-graphics/libsdl/libsdl-1.2.15')
3 files changed, 1317 insertions, 0 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch new file mode 100644 index 0000000000..3f97639533 --- /dev/null +++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch | |||
@@ -0,0 +1,1111 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: SDL-1.2.15/configure.in | ||
4 | =================================================================== | ||
5 | --- SDL-1.2.15.orig/configure.in | ||
6 | +++ SDL-1.2.15/configure.in | ||
7 | @@ -48,9 +48,9 @@ AC_CONFIG_AUX_DIR([build-scripts]) | ||
8 | dnl AC_CANONICAL_HOST | ||
9 | AC_C_BIGENDIAN | ||
10 | if test x$ac_cv_c_bigendian = xyes; then | ||
11 | - AC_DEFINE(SDL_BYTEORDER, 4321) | ||
12 | + AC_DEFINE(SDL_BYTEORDER, 4321, "Byte Order") | ||
13 | else | ||
14 | - AC_DEFINE(SDL_BYTEORDER, 1234) | ||
15 | + AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order") | ||
16 | fi | ||
17 | |||
18 | dnl Check for tools | ||
19 | @@ -134,7 +134,7 @@ AC_ARG_ENABLE(libc, | ||
20 | AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]), | ||
21 | , enable_libc=yes) | ||
22 | if test x$enable_libc = xyes; then | ||
23 | - AC_DEFINE(HAVE_LIBC) | ||
24 | + AC_DEFINE(HAVE_LIBC,1,"") | ||
25 | |||
26 | dnl Check for C library headers | ||
27 | AC_HEADER_STDC | ||
28 | @@ -145,7 +145,7 @@ if test x$enable_libc = xyes; then | ||
29 | if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then | ||
30 | AC_CHECK_TYPE(int64_t) | ||
31 | if test x$ac_cv_type_int64_t = xyes; then | ||
32 | - AC_DEFINE(SDL_HAS_64BIT_TYPE) | ||
33 | + AC_DEFINE(SDL_HAS_64BIT_TYPE,1,"") | ||
34 | fi | ||
35 | have_inttypes=yes | ||
36 | fi | ||
37 | @@ -161,11 +161,11 @@ if test x$enable_libc = xyes; then | ||
38 | |||
39 | AC_FUNC_MEMCMP | ||
40 | if test x$ac_cv_func_memcmp_working = xyes; then | ||
41 | - AC_DEFINE(HAVE_MEMCMP) | ||
42 | + AC_DEFINE(HAVE_MEMCMP,1,"") | ||
43 | fi | ||
44 | AC_FUNC_STRTOD | ||
45 | if test x$ac_cv_func_strtod = xyes; then | ||
46 | - AC_DEFINE(HAVE_STRTOD) | ||
47 | + AC_DEFINE(HAVE_STRTOD,1,"") | ||
48 | fi | ||
49 | AC_CHECK_FUNC(mprotect, | ||
50 | AC_TRY_COMPILE([ | ||
51 | @@ -191,40 +191,40 @@ if test x$have_inttypes != xyes; then | ||
52 | AC_CHECK_SIZEOF(long, 4) | ||
53 | AC_CHECK_SIZEOF(long long, 8) | ||
54 | if test x$ac_cv_sizeof_char = x1; then | ||
55 | - AC_DEFINE(int8_t, signed char) | ||
56 | - AC_DEFINE(uint8_t, unsigned char) | ||
57 | + AC_DEFINE(int8_t, signed char,"") | ||
58 | + AC_DEFINE(uint8_t, unsigned char,"") | ||
59 | fi | ||
60 | if test x$ac_cv_sizeof_short = x2; then | ||
61 | - AC_DEFINE(int16_t, signed short) | ||
62 | - AC_DEFINE(uint16_t, unsigned short) | ||
63 | + AC_DEFINE(int16_t, signed short,"") | ||
64 | + AC_DEFINE(uint16_t, unsigned short,"") | ||
65 | else | ||
66 | if test x$ac_cv_sizeof_int = x2; then | ||
67 | - AC_DEFINE(int16_t, signed int) | ||
68 | - AC_DEFINE(uint16_t, unsigned int) | ||
69 | + AC_DEFINE(int16_t, signed int,"") | ||
70 | + AC_DEFINE(uint16_t, unsigned int,"") | ||
71 | fi | ||
72 | fi | ||
73 | if test x$ac_cv_sizeof_int = x4; then | ||
74 | - AC_DEFINE(int32_t, signed int) | ||
75 | - AC_DEFINE(uint32_t, unsigned int) | ||
76 | + AC_DEFINE(int32_t, signed int,"") | ||
77 | + AC_DEFINE(uint32_t, unsigned int,"") | ||
78 | else | ||
79 | if test x$ac_cv_sizeof_long = x4; then | ||
80 | - AC_DEFINE(int32_t, signed long) | ||
81 | - AC_DEFINE(uint32_t, unsigned long) | ||
82 | + AC_DEFINE(int32_t, signed long,"") | ||
83 | + AC_DEFINE(uint32_t, unsigned long,"") | ||
84 | fi | ||
85 | fi | ||
86 | if test x$ac_cv_sizeof_long = x8; then | ||
87 | - AC_DEFINE(int64_t, signed long) | ||
88 | - AC_DEFINE(uint64_t, unsigned long) | ||
89 | - AC_DEFINE(SDL_HAS_64BIT_TYPE) | ||
90 | + AC_DEFINE(int64_t, signed long,"") | ||
91 | + AC_DEFINE(uint64_t, unsigned long,"") | ||
92 | + AC_DEFINE(SDL_HAS_64BIT_TYPE,"") | ||
93 | else | ||
94 | if test x$ac_cv_sizeof_long_long = x8; then | ||
95 | - AC_DEFINE(int64_t, signed long long) | ||
96 | - AC_DEFINE(uint64_t, unsigned long long) | ||
97 | - AC_DEFINE(SDL_HAS_64BIT_TYPE) | ||
98 | + AC_DEFINE(int64_t, signed long long,"") | ||
99 | + AC_DEFINE(uint64_t, unsigned long long,"") | ||
100 | + AC_DEFINE(SDL_HAS_64BIT_TYPE,"") | ||
101 | fi | ||
102 | fi | ||
103 | - AC_DEFINE(size_t, unsigned int) | ||
104 | - AC_DEFINE(uintptr_t, unsigned long) | ||
105 | + AC_DEFINE(size_t, unsigned int,"") | ||
106 | + AC_DEFINE(uintptr_t, unsigned long,"") | ||
107 | fi | ||
108 | |||
109 | # Standard C sources | ||
110 | @@ -245,25 +245,25 @@ AC_ARG_ENABLE(audio, | ||
111 | AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]), | ||
112 | , enable_audio=yes) | ||
113 | if test x$enable_audio != xyes; then | ||
114 | - AC_DEFINE(SDL_AUDIO_DISABLED) | ||
115 | + AC_DEFINE(SDL_AUDIO_DISABLED,1,"") | ||
116 | fi | ||
117 | AC_ARG_ENABLE(video, | ||
118 | AC_HELP_STRING([--enable-video], [Enable the video subsystem [[default=yes]]]), | ||
119 | , enable_video=yes) | ||
120 | if test x$enable_video != xyes; then | ||
121 | - AC_DEFINE(SDL_VIDEO_DISABLED) | ||
122 | + AC_DEFINE(SDL_VIDEO_DISABLED,1,"") | ||
123 | fi | ||
124 | AC_ARG_ENABLE(events, | ||
125 | AC_HELP_STRING([--enable-events], [Enable the events subsystem [[default=yes]]]), | ||
126 | , enable_events=yes) | ||
127 | if test x$enable_events != xyes; then | ||
128 | - AC_DEFINE(SDL_EVENTS_DISABLED) | ||
129 | + AC_DEFINE(SDL_EVENTS_DISABLED,1,"") | ||
130 | fi | ||
131 | AC_ARG_ENABLE(joystick, | ||
132 | AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]), | ||
133 | , enable_joystick=yes) | ||
134 | if test x$enable_joystick != xyes; then | ||
135 | - AC_DEFINE(SDL_JOYSTICK_DISABLED) | ||
136 | + AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"") | ||
137 | else | ||
138 | SOURCES="$SOURCES $srcdir/src/joystick/*.c" | ||
139 | fi | ||
140 | @@ -271,43 +271,43 @@ AC_ARG_ENABLE(cdrom, | ||
141 | AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]), | ||
142 | , enable_cdrom=yes) | ||
143 | if test x$enable_cdrom != xyes; then | ||
144 | - AC_DEFINE(SDL_CDROM_DISABLED) | ||
145 | + AC_DEFINE(SDL_CDROM_DISABLED,1,"") | ||
146 | fi | ||
147 | AC_ARG_ENABLE(threads, | ||
148 | AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]), | ||
149 | , enable_threads=yes) | ||
150 | if test x$enable_threads != xyes; then | ||
151 | - AC_DEFINE(SDL_THREADS_DISABLED) | ||
152 | + AC_DEFINE(SDL_THREADS_DISABLED,1,"") | ||
153 | fi | ||
154 | AC_ARG_ENABLE(timers, | ||
155 | AC_HELP_STRING([--enable-timers], [Enable the timer subsystem [[default=yes]]]), | ||
156 | , enable_timers=yes) | ||
157 | if test x$enable_timers != xyes; then | ||
158 | - AC_DEFINE(SDL_TIMERS_DISABLED) | ||
159 | + AC_DEFINE(SDL_TIMERS_DISABLED,1,"") | ||
160 | fi | ||
161 | AC_ARG_ENABLE(file, | ||
162 | AC_HELP_STRING([--enable-file], [Enable the file subsystem [[default=yes]]]), | ||
163 | , enable_file=yes) | ||
164 | if test x$enable_file != xyes; then | ||
165 | - AC_DEFINE(SDL_FILE_DISABLED) | ||
166 | + AC_DEFINE(SDL_FILE_DISABLED,1,"") | ||
167 | fi | ||
168 | AC_ARG_ENABLE(loadso, | ||
169 | AC_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [[default=yes]]]), | ||
170 | , enable_loadso=yes) | ||
171 | if test x$enable_loadso != xyes; then | ||
172 | - AC_DEFINE(SDL_LOADSO_DISABLED) | ||
173 | + AC_DEFINE(SDL_LOADSO_DISABLED,1,"") | ||
174 | fi | ||
175 | AC_ARG_ENABLE(cpuinfo, | ||
176 | AC_HELP_STRING([--enable-cpuinfo], [Enable the cpuinfo subsystem [[default=yes]]]), | ||
177 | , enable_cpuinfo=yes) | ||
178 | if test x$enable_cpuinfo != xyes; then | ||
179 | - AC_DEFINE(SDL_CPUINFO_DISABLED) | ||
180 | + AC_DEFINE(SDL_CPUINFO_DISABLED,1,"") | ||
181 | fi | ||
182 | AC_ARG_ENABLE(assembly, | ||
183 | AC_HELP_STRING([--enable-assembly], [Enable assembly routines [[default=yes]]]), | ||
184 | , enable_assembly=yes) | ||
185 | if test x$enable_assembly = xyes; then | ||
186 | - AC_DEFINE(SDL_ASSEMBLY_ROUTINES) | ||
187 | + AC_DEFINE(SDL_ASSEMBLY_ROUTINES,1,"") | ||
188 | fi | ||
189 | |||
190 | dnl See if the OSS audio interface is supported | ||
191 | @@ -335,12 +335,12 @@ AC_HELP_STRING([--enable-oss], [support | ||
192 | int arg = SNDCTL_DSP_SETFRAGMENT; | ||
193 | ],[ | ||
194 | have_oss=yes | ||
195 | - AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H) | ||
196 | + AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H,1,"") | ||
197 | ]) | ||
198 | fi | ||
199 | AC_MSG_RESULT($have_oss) | ||
200 | if test x$have_oss = xyes; then | ||
201 | - AC_DEFINE(SDL_AUDIO_DRIVER_OSS) | ||
202 | + AC_DEFINE(SDL_AUDIO_DRIVER_OSS,1,"") | ||
203 | SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c" | ||
204 | SOURCES="$SOURCES $srcdir/src/audio/dma/*.c" | ||
205 | have_audio=yes | ||
206 | @@ -407,7 +407,7 @@ CheckDMEDIA() | ||
207 | AC_MSG_RESULT($have_dmedia) | ||
208 | # Set up files for the audio library | ||
209 | if test x$have_dmedia = xyes; then | ||
210 | - AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA) | ||
211 | + AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA,1,"") | ||
212 | SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c" | ||
213 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio" | ||
214 | have_audio=yes | ||
215 | @@ -444,7 +444,7 @@ CheckMME() | ||
216 | AC_MSG_RESULT($have_mme) | ||
217 | # Set up files for the audio library | ||
218 | if test x$have_mme = xyes; then | ||
219 | - AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO) | ||
220 | + AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO,1,"") | ||
221 | SOURCES="$SOURCES $srcdir/src/audio/mme/*.c" | ||
222 | EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS" | ||
223 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS" | ||
224 | @@ -467,7 +467,7 @@ AC_HELP_STRING([--enable-esd-shared], [d | ||
225 | , enable_esd_shared=yes) | ||
226 | esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] | ||
227 | |||
228 | - AC_DEFINE(SDL_AUDIO_DRIVER_ESD) | ||
229 | + AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"") | ||
230 | SOURCES="$SOURCES $srcdir/src/audio/esd/*.c" | ||
231 | EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS" | ||
232 | if test x$have_loadso != xyes && \ | ||
233 | @@ -477,7 +477,7 @@ AC_HELP_STRING([--enable-esd-shared], [d | ||
234 | if test x$have_loadso = xyes && \ | ||
235 | test x$enable_esd_shared = xyes && test x$esd_lib != x; then | ||
236 | echo "-- dynamic libesd -> $esd_lib" | ||
237 | - AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib") | ||
238 | + AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "") | ||
239 | else | ||
240 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS" | ||
241 | fi | ||
242 | @@ -564,7 +564,7 @@ AC_HELP_STRING([--enable-arts-shared], [ | ||
243 | , enable_arts_shared=yes) | ||
244 | arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] | ||
245 | |||
246 | - AC_DEFINE(SDL_AUDIO_DRIVER_ARTS) | ||
247 | + AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "") | ||
248 | SOURCES="$SOURCES $srcdir/src/audio/arts/*.c" | ||
249 | EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS" | ||
250 | if test x$have_loadso != xyes && \ | ||
251 | @@ -574,7 +574,7 @@ AC_HELP_STRING([--enable-arts-shared], [ | ||
252 | if test x$have_loadso = xyes && \ | ||
253 | test x$enable_arts_shared = xyes && test x$arts_lib != x; then | ||
254 | echo "-- dynamic libartsc -> $arts_lib" | ||
255 | - AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib") | ||
256 | + AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"") | ||
257 | else | ||
258 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS" | ||
259 | fi | ||
260 | @@ -634,7 +634,7 @@ AC_HELP_STRING([--enable-nas-shared], [d | ||
261 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS" | ||
262 | fi | ||
263 | |||
264 | - AC_DEFINE(SDL_AUDIO_DRIVER_NAS) | ||
265 | + AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"") | ||
266 | SOURCES="$SOURCES $srcdir/src/audio/nas/*.c" | ||
267 | EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS" | ||
268 | have_audio=yes | ||
269 | @@ -649,7 +649,7 @@ CheckDiskAudio() | ||
270 | AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]), | ||
271 | , enable_diskaudio=yes) | ||
272 | if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then | ||
273 | - AC_DEFINE(SDL_AUDIO_DRIVER_DISK) | ||
274 | + AC_DEFINE(SDL_AUDIO_DRIVER_DISK,1,"") | ||
275 | SOURCES="$SOURCES $srcdir/src/audio/disk/*.c" | ||
276 | fi | ||
277 | } | ||
278 | @@ -661,7 +661,7 @@ CheckDummyAudio() | ||
279 | AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]), | ||
280 | , enable_dummyaudio=yes) | ||
281 | if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then | ||
282 | - AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY) | ||
283 | + AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY,1,"") | ||
284 | SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c" | ||
285 | fi | ||
286 | } | ||
287 | @@ -677,7 +677,7 @@ AC_HELP_STRING([--enable-mintaudio], [su | ||
288 | AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes) | ||
289 | if test x$have_mint_falcon_hdr = xyes; then | ||
290 | mintaudio=yes | ||
291 | - AC_DEFINE(SDL_AUDIO_DRIVER_MINT) | ||
292 | + AC_DEFINE(SDL_AUDIO_DRIVER_MINT,1,"") | ||
293 | SOURCES="$SOURCES $srcdir/src/audio/mint/*.c" | ||
294 | SOURCES="$SOURCES $srcdir/src/audio/mint/*.S" | ||
295 | have_audio=yes | ||
296 | @@ -746,7 +746,7 @@ AC_HELP_STRING([--enable-nasm], [use nas | ||
297 | CompileNASM unquoted-sections || NASM="" | ||
298 | |||
299 | if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then | ||
300 | - AC_DEFINE(SDL_HERMES_BLITTERS) | ||
301 | + AC_DEFINE(SDL_HERMES_BLITTERS,1,"") | ||
302 | SOURCES="$SOURCES $srcdir/src/hermes/*.asm" | ||
303 | NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/" | ||
304 | |||
305 | @@ -840,9 +840,9 @@ AC_HELP_STRING([--enable-altivec], [use | ||
306 | CFLAGS="$save_CFLAGS" | ||
307 | |||
308 | if test x$have_gcc_altivec = xyes; then | ||
309 | - AC_DEFINE(SDL_ALTIVEC_BLITTERS) | ||
310 | + AC_DEFINE(SDL_ALTIVEC_BLITTERS,1,"") | ||
311 | if test x$have_altivec_h_hdr = xyes; then | ||
312 | - AC_DEFINE(HAVE_ALTIVEC_H) | ||
313 | + AC_DEFINE(HAVE_ALTIVEC_H,1,"") | ||
314 | fi | ||
315 | EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS" | ||
316 | fi | ||
317 | @@ -920,7 +920,7 @@ AC_HELP_STRING([--enable-ipod], [configu | ||
318 | |||
319 | if test x$enable_ipod = xyes; then | ||
320 | EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD" | ||
321 | - AC_DEFINE(SDL_VIDEO_DRIVER_IPOD) | ||
322 | + AC_DEFINE(SDL_VIDEO_DRIVER_IPOD,1,"") | ||
323 | SOURCES="$SOURCES $srcdir/src/video/ipod/*.c" | ||
324 | fi | ||
325 | } | ||
326 | @@ -954,7 +954,7 @@ CheckNANOX() | ||
327 | EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB" | ||
328 | fi | ||
329 | |||
330 | - AC_DEFINE(SDL_VIDEO_DRIVER_NANOX) | ||
331 | + AC_DEFINE(SDL_VIDEO_DRIVER_NANOX,1,"") | ||
332 | SOURCES="$SOURCES $srcdir/src/video/nanox/*.c" | ||
333 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X" | ||
334 | have_video=yes | ||
335 | @@ -1020,7 +1020,7 @@ AC_HELP_STRING([--enable-x11-shared], [d | ||
336 | CFLAGS="$CFLAGS $X_CFLAGS" | ||
337 | LDFLAGS="$LDFLAGS $X_LIBS" | ||
338 | |||
339 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11) | ||
340 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11,1,"") | ||
341 | SOURCES="$SOURCES $srcdir/src/video/x11/*.c" | ||
342 | EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" | ||
343 | |||
344 | @@ -1042,8 +1042,8 @@ AC_HELP_STRING([--enable-x11-shared], [d | ||
345 | test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then | ||
346 | echo "-- dynamic libX11 -> $x11_lib" | ||
347 | echo "-- dynamic libX11ext -> $x11ext_lib" | ||
348 | - AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib") | ||
349 | - AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib") | ||
350 | + AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib","") | ||
351 | + AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib","") | ||
352 | else | ||
353 | enable_x11_shared=no | ||
354 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext" | ||
355 | @@ -1060,20 +1060,20 @@ AC_HELP_STRING([--enable-dga], [allow us | ||
356 | AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]), | ||
357 | , enable_video_dga=yes) | ||
358 | if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then | ||
359 | - AC_DEFINE(SDL_VIDEO_DRIVER_DGA) | ||
360 | + AC_DEFINE(SDL_VIDEO_DRIVER_DGA,1,"") | ||
361 | SOURCES="$SOURCES $srcdir/src/video/dga/*.c" | ||
362 | fi | ||
363 | AC_ARG_ENABLE(video-x11-dgamouse, | ||
364 | AC_HELP_STRING([--enable-video-x11-dgamouse], [use X11 DGA for mouse events [[default=yes]]]), | ||
365 | , enable_video_x11_dgamouse=yes) | ||
366 | if test x$enable_dga = xyes -a x$enable_video_x11_dgamouse = xyes; then | ||
367 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE) | ||
368 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE,1,"") | ||
369 | fi | ||
370 | AC_ARG_ENABLE(video-x11-vm, | ||
371 | AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[default=yes]]]), | ||
372 | , enable_video_x11_vm=yes) | ||
373 | if test x$enable_video_x11_vm = xyes; then | ||
374 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE) | ||
375 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE,1,"") | ||
376 | SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c" | ||
377 | fi | ||
378 | AC_ARG_ENABLE(video-x11-xv, | ||
379 | @@ -1087,14 +1087,14 @@ AC_HELP_STRING([--enable-video-x11-xv], | ||
380 | AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]), | ||
381 | , enable_video_x11_xinerama=yes) | ||
382 | if test x$enable_video_x11_xinerama = xyes; then | ||
383 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA) | ||
384 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA,1,"") | ||
385 | SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c" | ||
386 | fi | ||
387 | AC_ARG_ENABLE(video-x11-xme, | ||
388 | AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]), | ||
389 | , enable_video_x11_xme=yes) | ||
390 | if test x$enable_video_x11_xme = xyes; then | ||
391 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME) | ||
392 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME,1,"") | ||
393 | SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c" | ||
394 | fi | ||
395 | AC_ARG_ENABLE(video-x11-xrandr, | ||
396 | @@ -1111,8 +1111,8 @@ AC_HELP_STRING([--enable-video-x11-xrand | ||
397 | if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then | ||
398 | echo "-- dynamic libXrender -> $xrender_lib" | ||
399 | echo "-- dynamic libXrandr -> $xrandr_lib" | ||
400 | - AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib") | ||
401 | - AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib") | ||
402 | + AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib","") | ||
403 | + AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib","") | ||
404 | definitely_enable_video_x11_xrandr=yes | ||
405 | else | ||
406 | AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes) | ||
407 | @@ -1125,7 +1125,7 @@ AC_HELP_STRING([--enable-video-x11-xrand | ||
408 | fi | ||
409 | fi | ||
410 | if test x$definitely_enable_video_x11_xrandr = xyes; then | ||
411 | - AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) | ||
412 | + AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"") | ||
413 | fi | ||
414 | fi | ||
415 | fi | ||
416 | @@ -1152,7 +1152,7 @@ AC_HELP_STRING([--enable-video-photon], | ||
417 | ]) | ||
418 | AC_MSG_RESULT($video_photon) | ||
419 | if test x$video_photon = xyes; then | ||
420 | - AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON) | ||
421 | + AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON,1,"") | ||
422 | SOURCES="$SOURCES $srcdir/src/video/photon/*.c" | ||
423 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph" | ||
424 | have_video=yes | ||
425 | @@ -1166,7 +1166,7 @@ dnl Set up the BWindow video driver if e | ||
426 | CheckBWINDOW() | ||
427 | { | ||
428 | if test x$enable_video = xyes; then | ||
429 | - AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW) | ||
430 | + AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW,1,"") | ||
431 | SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc" | ||
432 | have_video=yes | ||
433 | fi | ||
434 | @@ -1189,7 +1189,7 @@ AC_HELP_STRING([--enable-video-carbon], | ||
435 | ]) | ||
436 | AC_MSG_RESULT($have_carbon) | ||
437 | if test x$have_carbon = xyes; then | ||
438 | - AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX) | ||
439 | + AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX,1,"") | ||
440 | SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c" | ||
441 | SOURCES="$SOURCES $srcdir/src/video/macrom/*.c" | ||
442 | have_video=yes | ||
443 | @@ -1218,7 +1218,7 @@ AC_HELP_STRING([--enable-video-cocoa], [ | ||
444 | AC_MSG_RESULT($have_cocoa) | ||
445 | CFLAGS="$save_CFLAGS" | ||
446 | if test x$have_cocoa = xyes; then | ||
447 | - AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ) | ||
448 | + AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ,1,"") | ||
449 | SOURCES="$SOURCES $srcdir/src/video/quartz/*.m" | ||
450 | have_video=yes | ||
451 | fi | ||
452 | @@ -1245,7 +1245,7 @@ AC_HELP_STRING([--enable-video-fbcon], [ | ||
453 | AC_MSG_RESULT($video_fbcon) | ||
454 | if test x$video_fbcon = xyes; then | ||
455 | AC_CHECK_FUNCS(getpagesize) | ||
456 | - AC_DEFINE(SDL_VIDEO_DRIVER_FBCON) | ||
457 | + AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"") | ||
458 | SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c" | ||
459 | have_video=yes | ||
460 | fi | ||
461 | @@ -1296,7 +1296,7 @@ AC_HELP_STRING([--enable-video-directfb] | ||
462 | AC_MSG_RESULT($video_directfb) | ||
463 | |||
464 | if test x$video_directfb = xyes; then | ||
465 | - AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB) | ||
466 | + AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB,1,"") | ||
467 | SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" | ||
468 | EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" | ||
469 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" | ||
470 | @@ -1323,7 +1323,7 @@ AC_HELP_STRING([--enable-video-ps2gs], [ | ||
471 | ]) | ||
472 | AC_MSG_RESULT($video_ps2gs) | ||
473 | if test x$video_ps2gs = xyes; then | ||
474 | - AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS) | ||
475 | + AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS,1,"") | ||
476 | SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c" | ||
477 | have_video=yes | ||
478 | fi | ||
479 | @@ -1376,7 +1376,7 @@ AC_HELP_STRING([--enable-video-ggi], [us | ||
480 | ]) | ||
481 | AC_MSG_RESULT($video_ggi) | ||
482 | if test x$video_ggi = xyes; then | ||
483 | - AC_DEFINE(SDL_VIDEO_DRIVER_GGI) | ||
484 | + AC_DEFINE(SDL_VIDEO_DRIVER_GGI,1,"") | ||
485 | SOURCES="$SOURCES $srcdir/src/video/ggi/*.c" | ||
486 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg" | ||
487 | have_video=yes | ||
488 | @@ -1406,7 +1406,7 @@ AC_HELP_STRING([--enable-video-svga], [u | ||
489 | ]) | ||
490 | AC_MSG_RESULT($video_svga) | ||
491 | if test x$video_svga = xyes; then | ||
492 | - AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB) | ||
493 | + AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB,1,"") | ||
494 | SOURCES="$SOURCES $srcdir/src/video/svga/*.c" | ||
495 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga" | ||
496 | have_video=yes | ||
497 | @@ -1438,7 +1438,7 @@ AC_HELP_STRING([--enable-video-vgl], [us | ||
498 | ]) | ||
499 | AC_MSG_RESULT($video_vgl) | ||
500 | if test x$video_vgl = xyes; then | ||
501 | - AC_DEFINE(SDL_VIDEO_DRIVER_VGL) | ||
502 | + AC_DEFINE(SDL_VIDEO_DRIVER_VGL,1,"") | ||
503 | SOURCES="$SOURCES $srcdir/src/video/vgl/*.c" | ||
504 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl" | ||
505 | have_video=yes | ||
506 | @@ -1466,7 +1466,7 @@ AC_HELP_STRING([--enable-video-wscons], | ||
507 | ]) | ||
508 | AC_MSG_RESULT($video_wscons) | ||
509 | if test x$video_wscons = xyes; then | ||
510 | - AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS) | ||
511 | + AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS,1,"") | ||
512 | SOURCES="$SOURCES $srcdir/src/video/wscons/*.c" | ||
513 | have_video=yes | ||
514 | fi | ||
515 | @@ -1491,7 +1491,7 @@ AC_HELP_STRING([--enable-video-aalib], [ | ||
516 | ]) | ||
517 | AC_MSG_RESULT($video_aalib) | ||
518 | if test x$video_aalib = xyes; then | ||
519 | - AC_DEFINE(SDL_VIDEO_DRIVER_AALIB) | ||
520 | + AC_DEFINE(SDL_VIDEO_DRIVER_AALIB,1,"") | ||
521 | SOURCES="$SOURCES $srcdir/src/video/aalib/*.c" | ||
522 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa" | ||
523 | have_video=yes | ||
524 | @@ -1553,7 +1553,7 @@ AC_HELP_STRING([--enable-video-qtopia], | ||
525 | CXXFLAGS="$OLD_CXX" | ||
526 | AC_MSG_RESULT($video_qtopia) | ||
527 | if test x$video_qtopia = xyes; then | ||
528 | - AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA) | ||
529 | + AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA,1,"") | ||
530 | SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc" | ||
531 | SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc" | ||
532 | SDLMAIN_LDFLAGS="-static" | ||
533 | @@ -1583,7 +1583,7 @@ AC_HELP_STRING([--enable-video-picogui], | ||
534 | ]) | ||
535 | AC_MSG_RESULT($video_picogui) | ||
536 | if test x$video_picogui = xyes; then | ||
537 | - AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI) | ||
538 | + AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI,1,"") | ||
539 | SOURCES="$SOURCES $srcdir/src/video/picogui/*.c" | ||
540 | SDL_LIBS="$SDL_LIBS -lpgui" | ||
541 | have_video=yes | ||
542 | @@ -1607,7 +1607,7 @@ AC_HELP_STRING([--enable-video-xbios], [ | ||
543 | video_xbios=no | ||
544 | if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then | ||
545 | video_xbios=yes | ||
546 | - AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS) | ||
547 | + AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS,1,"") | ||
548 | SOURCES="$SOURCES $srcdir/src/video/xbios/*.c" | ||
549 | have_video=yes | ||
550 | fi | ||
551 | @@ -1625,7 +1625,7 @@ AC_HELP_STRING([--enable-video-gem], [us | ||
552 | AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes) | ||
553 | if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then | ||
554 | video_gem=yes | ||
555 | - AC_DEFINE(SDL_VIDEO_DRIVER_GEM) | ||
556 | + AC_DEFINE(SDL_VIDEO_DRIVER_GEM,1,"") | ||
557 | SOURCES="$SOURCES $srcdir/src/video/gem/*.c" | ||
558 | SDL_LIBS="$SDL_LIBS -lgem" | ||
559 | have_video=yes | ||
560 | @@ -1640,7 +1640,7 @@ CheckDummyVideo() | ||
561 | AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]), | ||
562 | , enable_video_dummy=yes) | ||
563 | if test x$enable_video_dummy = xyes; then | ||
564 | - AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY) | ||
565 | + AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY,1,"") | ||
566 | SOURCES="$SOURCES $srcdir/src/video/dummy/*.c" | ||
567 | have_video=yes | ||
568 | fi | ||
569 | @@ -1667,8 +1667,8 @@ CheckOpenGLX11() | ||
570 | ]) | ||
571 | AC_MSG_RESULT($video_opengl) | ||
572 | if test x$video_opengl = xyes; then | ||
573 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
574 | - AC_DEFINE(SDL_VIDEO_OPENGL_GLX) | ||
575 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
576 | + AC_DEFINE(SDL_VIDEO_OPENGL_GLX,1,"") | ||
577 | fi | ||
578 | fi | ||
579 | } | ||
580 | @@ -1687,7 +1687,7 @@ CheckOpenGLQNX() | ||
581 | ]) | ||
582 | AC_MSG_RESULT($video_opengl) | ||
583 | if test x$video_opengl = xyes; then | ||
584 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
585 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
586 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" | ||
587 | fi | ||
588 | fi | ||
589 | @@ -1697,8 +1697,8 @@ dnl Check for Win32 OpenGL | ||
590 | CheckWIN32GL() | ||
591 | { | ||
592 | if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then | ||
593 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
594 | - AC_DEFINE(SDL_VIDEO_OPENGL_WGL) | ||
595 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
596 | + AC_DEFINE(SDL_VIDEO_OPENGL_WGL,1,"") | ||
597 | fi | ||
598 | } | ||
599 | |||
600 | @@ -1706,7 +1706,7 @@ dnl Check for BeOS OpenGL | ||
601 | CheckBeGL() | ||
602 | { | ||
603 | if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then | ||
604 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
605 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
606 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" | ||
607 | fi | ||
608 | } | ||
609 | @@ -1715,7 +1715,7 @@ dnl Check for MacOS OpenGL | ||
610 | CheckMacGL() | ||
611 | { | ||
612 | if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then | ||
613 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
614 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
615 | case "$host" in | ||
616 | *-*-darwin*) | ||
617 | if test x$enable_video_cocoa = xyes; then | ||
618 | @@ -1747,8 +1747,8 @@ CheckAtariOSMesa() | ||
619 | OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags` | ||
620 | OSMESA_LIBS=`$OSMESA_CONFIG --libs` | ||
621 | fi | ||
622 | - AC_DEFINE(SDL_VIDEO_OPENGL) | ||
623 | - AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA) | ||
624 | + AC_DEFINE(SDL_VIDEO_OPENGL,1,"") | ||
625 | + AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA,1,"") | ||
626 | SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS" | ||
627 | SDL_LIBS="$SDL_LIBS $OSMESA_LIBS" | ||
628 | |||
629 | @@ -1758,7 +1758,7 @@ AC_HELP_STRING([--enable-osmesa-shared], | ||
630 | if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then | ||
631 | # Dynamic linking | ||
632 | if test "x$have_osmesa_hdr" = "xyes"; then | ||
633 | - AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC) | ||
634 | + AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC,1,"") | ||
635 | fi | ||
636 | fi | ||
637 | fi | ||
638 | @@ -1792,7 +1792,7 @@ AC_HELP_STRING([--enable-input-events], | ||
639 | ]) | ||
640 | AC_MSG_RESULT($use_input_events) | ||
641 | if test x$use_input_events = xyes; then | ||
642 | - AC_DEFINE(SDL_INPUT_LINUXEV) | ||
643 | + AC_DEFINE(SDL_INPUT_LINUXEV,1,"") | ||
644 | fi | ||
645 | fi | ||
646 | } | ||
647 | @@ -1814,7 +1814,7 @@ AC_HELP_STRING([--enable-input-tslib], [ | ||
648 | ]) | ||
649 | AC_MSG_RESULT($enable_input_tslib) | ||
650 | if test x$enable_input_tslib = xyes; then | ||
651 | - AC_DEFINE(SDL_INPUT_TSLIB) | ||
652 | + AC_DEFINE(SDL_INPUT_TSLIB,1,"") | ||
653 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts" | ||
654 | fi | ||
655 | fi | ||
656 | @@ -1837,7 +1837,7 @@ AC_HELP_STRING([--enable-pth], [use GNU | ||
657 | AC_MSG_CHECKING(pth) | ||
658 | AC_MSG_RESULT($use_pth) | ||
659 | if test "x$use_pth" = xyes; then | ||
660 | - AC_DEFINE(SDL_THREAD_PTH) | ||
661 | + AC_DEFINE(SDL_THREAD_PTH,1,"") | ||
662 | SOURCES="$SOURCES $srcdir/src/thread/pth/*.c" | ||
663 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c" | ||
664 | SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`" | ||
665 | @@ -1943,7 +1943,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ | ||
666 | |||
667 | # Do futher testing if we have pthread support... | ||
668 | if test x$use_pthreads = xyes; then | ||
669 | - AC_DEFINE(SDL_THREAD_PTHREAD) | ||
670 | + AC_DEFINE(SDL_THREAD_PTHREAD,1,"") | ||
671 | EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags" | ||
672 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib" | ||
673 | SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags" | ||
674 | @@ -1965,7 +1965,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ | ||
675 | pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); | ||
676 | ],[ | ||
677 | has_recursive_mutexes=yes | ||
678 | - AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX) | ||
679 | + AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX,1,"") | ||
680 | ]) | ||
681 | fi | ||
682 | if test x$has_recursive_mutexes = xno; then | ||
683 | @@ -1976,7 +1976,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ | ||
684 | pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP); | ||
685 | ],[ | ||
686 | has_recursive_mutexes=yes | ||
687 | - AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP) | ||
688 | + AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP,1,"") | ||
689 | ]) | ||
690 | fi | ||
691 | AC_MSG_RESULT($has_recursive_mutexes) | ||
692 | @@ -2065,7 +2065,7 @@ AC_HELP_STRING([--enable-stdio-redirect] | ||
693 | fi | ||
694 | |||
695 | if test x$enable_video = xyes; then | ||
696 | - AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB) | ||
697 | + AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB,1,"") | ||
698 | SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c" | ||
699 | SOURCES="$SOURCES $srcdir/src/video/windib/*.c" | ||
700 | have_video=yes | ||
701 | @@ -2087,7 +2087,7 @@ AC_HELP_STRING([--enable-directx], [use | ||
702 | have_directx=yes | ||
703 | fi | ||
704 | if test x$enable_video = xyes -a x$have_directx = xyes; then | ||
705 | - AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW) | ||
706 | + AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW,1,"") | ||
707 | SOURCES="$SOURCES $srcdir/src/video/windx5/*.c" | ||
708 | have_video=yes | ||
709 | fi | ||
710 | @@ -2118,7 +2118,7 @@ AC_HELP_STRING([--enable-sdl-dlopen], [u | ||
711 | AC_CHECK_LIB(c, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS", | ||
712 | AC_CHECK_LIB(dl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl", | ||
713 | AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl"))) | ||
714 | - AC_DEFINE(SDL_LOADSO_DLOPEN) | ||
715 | + AC_DEFINE(SDL_LOADSO_DLOPEN,1,"") | ||
716 | SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" | ||
717 | have_loadso=yes | ||
718 | fi | ||
719 | @@ -2135,7 +2135,7 @@ AC_HELP_STRING([--enable-atari-ldg], [us | ||
720 | AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes) | ||
721 | AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem) | ||
722 | if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then | ||
723 | - AC_DEFINE(SDL_LOADSO_LDG) | ||
724 | + AC_DEFINE(SDL_LOADSO_LDG,1,"") | ||
725 | SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c" | ||
726 | SDL_LIBS="$SDL_LIBS -lldg -lgem" | ||
727 | have_loadso=yes | ||
728 | @@ -2266,11 +2266,11 @@ CheckUSBHID() | ||
729 | have_machine_joystick=yes | ||
730 | ]) | ||
731 | if test x$have_machine_joystick = xyes; then | ||
732 | - AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H) | ||
733 | + AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H,1,"") | ||
734 | fi | ||
735 | AC_MSG_RESULT($have_machine_joystick) | ||
736 | |||
737 | - AC_DEFINE(SDL_JOYSTICK_USBHID) | ||
738 | + AC_DEFINE(SDL_JOYSTICK_USBHID,1,"") | ||
739 | SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c" | ||
740 | EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS" | ||
741 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS" | ||
742 | @@ -2289,7 +2289,7 @@ AC_HELP_STRING([--enable-clock_gettime], | ||
743 | if test x$enable_clock_gettime = xyes; then | ||
744 | AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes) | ||
745 | if test x$have_clock_gettime = xyes; then | ||
746 | - AC_DEFINE(HAVE_CLOCK_GETTIME) | ||
747 | + AC_DEFINE(HAVE_CLOCK_GETTIME,1,"") | ||
748 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt" | ||
749 | fi | ||
750 | fi | ||
751 | @@ -2320,7 +2320,7 @@ case "$host" in | ||
752 | CheckIPod | ||
753 | # Set up files for the timer library | ||
754 | if test x$enable_timers = xyes; then | ||
755 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
756 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
757 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
758 | have_timers=yes | ||
759 | fi | ||
760 | @@ -2386,17 +2386,17 @@ case "$host" in | ||
761 | if test x$enable_audio = xyes; then | ||
762 | case $ARCH in | ||
763 | sysv5|solaris|hpux) | ||
764 | - AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO) | ||
765 | + AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"") | ||
766 | SOURCES="$SOURCES $srcdir/src/audio/sun/*.c" | ||
767 | have_audio=yes | ||
768 | ;; | ||
769 | netbsd|openbsd) | ||
770 | - AC_DEFINE(SDL_AUDIO_DRIVER_BSD) | ||
771 | + AC_DEFINE(SDL_AUDIO_DRIVER_BSD,1,"") | ||
772 | SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c" | ||
773 | have_audio=yes | ||
774 | ;; | ||
775 | aix) | ||
776 | - AC_DEFINE(SDL_AUDIO_DRIVER_PAUD) | ||
777 | + AC_DEFINE(SDL_AUDIO_DRIVER_PAUD,1,"") | ||
778 | SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c" | ||
779 | have_audio=yes | ||
780 | ;; | ||
781 | @@ -2406,7 +2406,7 @@ case "$host" in | ||
782 | if test x$enable_joystick = xyes; then | ||
783 | case $ARCH in | ||
784 | linux) | ||
785 | - AC_DEFINE(SDL_JOYSTICK_LINUX) | ||
786 | + AC_DEFINE(SDL_JOYSTICK_LINUX,1,"") | ||
787 | SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c" | ||
788 | have_joystick=yes | ||
789 | ;; | ||
790 | @@ -2416,32 +2416,32 @@ case "$host" in | ||
791 | if test x$enable_cdrom = xyes; then | ||
792 | case $ARCH in | ||
793 | linux|solaris) | ||
794 | - AC_DEFINE(SDL_CDROM_LINUX) | ||
795 | + AC_DEFINE(SDL_CDROM_LINUX,1,"") | ||
796 | SOURCES="$SOURCES $srcdir/src/cdrom/linux/*.c" | ||
797 | have_cdrom=yes | ||
798 | ;; | ||
799 | *freebsd*) | ||
800 | - AC_DEFINE(SDL_CDROM_FREEBSD) | ||
801 | + AC_DEFINE(SDL_CDROM_FREEBSD,1,"") | ||
802 | SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c" | ||
803 | have_cdrom=yes | ||
804 | ;; | ||
805 | *openbsd*|*netbsd*) | ||
806 | - AC_DEFINE(SDL_CDROM_OPENBSD) | ||
807 | + AC_DEFINE(SDL_CDROM_OPENBSD,1,"") | ||
808 | SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c" | ||
809 | have_cdrom=yes | ||
810 | ;; | ||
811 | bsdi) | ||
812 | - AC_DEFINE(SDL_CDROM_BSDI) | ||
813 | + AC_DEFINE(SDL_CDROM_BSDI,1,"") | ||
814 | SOURCES="$SOURCES $srcdir/src/cdrom/bsdi/*.c" | ||
815 | have_cdrom=yes | ||
816 | ;; | ||
817 | aix) | ||
818 | - AC_DEFINE(SDL_CDROM_AIX) | ||
819 | + AC_DEFINE(SDL_CDROM_AIX,1,"") | ||
820 | SOURCES="$SOURCES $srcdir/src/cdrom/aix/*.c" | ||
821 | have_cdrom=yes | ||
822 | ;; | ||
823 | osf) | ||
824 | - AC_DEFINE(SDL_CDROM_OSF) | ||
825 | + AC_DEFINE(SDL_CDROM_OSF,1,"") | ||
826 | SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c" | ||
827 | have_cdrom=yes | ||
828 | ;; | ||
829 | @@ -2449,7 +2449,7 @@ case "$host" in | ||
830 | fi | ||
831 | # Set up files for the thread library | ||
832 | if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then | ||
833 | - AC_DEFINE(SDL_THREAD_SPROC) | ||
834 | + AC_DEFINE(SDL_THREAD_SPROC,1,"") | ||
835 | SOURCES="$SOURCES $srcdir/src/thread/irix/*.c" | ||
836 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" | ||
837 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" | ||
838 | @@ -2457,7 +2457,7 @@ case "$host" in | ||
839 | fi | ||
840 | # Set up files for the timer library | ||
841 | if test x$enable_timers = xyes; then | ||
842 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
843 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
844 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
845 | have_timers=yes | ||
846 | fi | ||
847 | @@ -2476,20 +2476,20 @@ case "$host" in | ||
848 | CheckPTHREAD | ||
849 | # Set up files for the audio library | ||
850 | if test x$enable_audio = xyes; then | ||
851 | - AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO) | ||
852 | + AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO,1,"") | ||
853 | SOURCES="$SOURCES $srcdir/src/audio/nto/*.c" | ||
854 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound" | ||
855 | have_audio=yes | ||
856 | fi | ||
857 | # Set up files for the cdrom library | ||
858 | if test x$enable_cdrom = xyes; then | ||
859 | - AC_DEFINE(SDL_CDROM_QNX) | ||
860 | + AC_DEFINE(SDL_CDROM_QNX,1,"") | ||
861 | SOURCES="$SOURCES $srcdir/src/cdrom/qnx/*.c" | ||
862 | have_cdrom=yes | ||
863 | fi | ||
864 | # Set up files for the timer library | ||
865 | if test x$enable_timers = xyes; then | ||
866 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
867 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
868 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
869 | have_timers=yes | ||
870 | fi | ||
871 | @@ -2514,29 +2514,29 @@ case "$host" in | ||
872 | CheckNASM | ||
873 | # Set up files for the audio library | ||
874 | if test x$enable_audio = xyes; then | ||
875 | - AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT) | ||
876 | + AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT,1,"") | ||
877 | SOURCES="$SOURCES $srcdir/src/audio/windib/*.c" | ||
878 | if test x$have_directx = xyes; then | ||
879 | - AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND) | ||
880 | + AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND,1,"") | ||
881 | SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c" | ||
882 | fi | ||
883 | have_audio=yes | ||
884 | fi | ||
885 | # Set up files for the joystick library | ||
886 | if test x$enable_joystick = xyes; then | ||
887 | - AC_DEFINE(SDL_JOYSTICK_WINMM) | ||
888 | + AC_DEFINE(SDL_JOYSTICK_WINMM,1,"") | ||
889 | SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c" | ||
890 | have_joystick=yes | ||
891 | fi | ||
892 | # Set up files for the cdrom library | ||
893 | if test x$enable_cdrom = xyes; then | ||
894 | - AC_DEFINE(SDL_CDROM_WIN32) | ||
895 | + AC_DEFINE(SDL_CDROM_WIN32,1,"") | ||
896 | SOURCES="$SOURCES $srcdir/src/cdrom/win32/*.c" | ||
897 | have_cdrom=yes | ||
898 | fi | ||
899 | # Set up files for the thread library | ||
900 | if test x$enable_threads = xyes; then | ||
901 | - AC_DEFINE(SDL_THREAD_WIN32) | ||
902 | + AC_DEFINE(SDL_THREAD_WIN32,1,"") | ||
903 | SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" | ||
904 | SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" | ||
905 | SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" | ||
906 | @@ -2545,13 +2545,13 @@ case "$host" in | ||
907 | fi | ||
908 | # Set up files for the timer library | ||
909 | if test x$enable_timers = xyes; then | ||
910 | - AC_DEFINE(SDL_TIMER_WIN32) | ||
911 | + AC_DEFINE(SDL_TIMER_WIN32,1,"") | ||
912 | SOURCES="$SOURCES $srcdir/src/timer/win32/*.c" | ||
913 | have_timers=yes | ||
914 | fi | ||
915 | # Set up files for the shared object loading library | ||
916 | if test x$enable_loadso = xyes; then | ||
917 | - AC_DEFINE(SDL_LOADSO_WIN32) | ||
918 | + AC_DEFINE(SDL_LOADSO_WIN32,1,"") | ||
919 | SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" | ||
920 | have_loadso=yes | ||
921 | fi | ||
922 | @@ -2622,25 +2622,25 @@ case "$host" in | ||
923 | CheckBeGL | ||
924 | # Set up files for the audio library | ||
925 | if test x$enable_audio = xyes; then | ||
926 | - AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO) | ||
927 | + AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO,1,"") | ||
928 | SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc" | ||
929 | have_audio=yes | ||
930 | fi | ||
931 | # Set up files for the joystick library | ||
932 | if test x$enable_joystick = xyes; then | ||
933 | - AC_DEFINE(SDL_JOYSTICK_BEOS) | ||
934 | + AC_DEFINE(SDL_JOYSTICK_BEOS,1,"") | ||
935 | SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc" | ||
936 | have_joystick=yes | ||
937 | fi | ||
938 | # Set up files for the cdrom library | ||
939 | if test x$enable_cdrom = xyes; then | ||
940 | - AC_DEFINE(SDL_CDROM_BEOS) | ||
941 | + AC_DEFINE(SDL_CDROM_BEOS,1,"") | ||
942 | SOURCES="$SOURCES $srcdir/src/cdrom/beos/*.cc" | ||
943 | have_cdrom=yes | ||
944 | fi | ||
945 | # Set up files for the thread library | ||
946 | if test x$enable_threads = xyes; then | ||
947 | - AC_DEFINE(SDL_THREAD_BEOS) | ||
948 | + AC_DEFINE(SDL_THREAD_BEOS,1,"") | ||
949 | SOURCES="$SOURCES $srcdir/src/thread/beos/*.c" | ||
950 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" | ||
951 | SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" | ||
952 | @@ -2648,7 +2648,7 @@ case "$host" in | ||
953 | fi | ||
954 | # Set up files for the timer library | ||
955 | if test x$enable_timers = xyes; then | ||
956 | - AC_DEFINE(SDL_TIMER_BEOS) | ||
957 | + AC_DEFINE(SDL_TIMER_BEOS,1,"") | ||
958 | SOURCES="$SOURCES $srcdir/src/timer/beos/*.c" | ||
959 | have_timers=yes | ||
960 | fi | ||
961 | @@ -2656,11 +2656,11 @@ case "$host" in | ||
962 | if test x$enable_loadso = xyes; then | ||
963 | case "$host" in | ||
964 | *-*-beos*) | ||
965 | - AC_DEFINE(SDL_LOADSO_BEOS) | ||
966 | + AC_DEFINE(SDL_LOADSO_BEOS,1,"") | ||
967 | SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c" | ||
968 | ;; | ||
969 | *-*-haiku*) | ||
970 | - AC_DEFINE(SDL_LOADSO_DLOPEN) | ||
971 | + AC_DEFINE(SDL_LOADSO_DLOPEN,1,"") | ||
972 | SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" | ||
973 | ;; | ||
974 | esac | ||
975 | @@ -2696,7 +2696,7 @@ case "$host" in | ||
976 | # Set up files for the shared object loading library | ||
977 | # (this needs to be done before the dynamic X11 check) | ||
978 | if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then | ||
979 | - AC_DEFINE(SDL_LOADSO_DLCOMPAT) | ||
980 | + AC_DEFINE(SDL_LOADSO_DLCOMPAT,1,"") | ||
981 | SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c" | ||
982 | have_loadso=yes | ||
983 | fi | ||
984 | @@ -2714,26 +2714,26 @@ case "$host" in | ||
985 | |||
986 | # Set up files for the audio library | ||
987 | if test x$enable_audio = xyes; then | ||
988 | - AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO) | ||
989 | + AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"") | ||
990 | SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c" | ||
991 | have_audio=yes | ||
992 | fi | ||
993 | # Set up files for the joystick library | ||
994 | if test x$enable_joystick = xyes; then | ||
995 | - AC_DEFINE(SDL_JOYSTICK_IOKIT) | ||
996 | + AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"") | ||
997 | SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c" | ||
998 | have_joystick=yes | ||
999 | need_iokit_framework=yes | ||
1000 | fi | ||
1001 | # Set up files for the cdrom library | ||
1002 | if test x$enable_cdrom = xyes; then | ||
1003 | - AC_DEFINE(SDL_CDROM_MACOSX) | ||
1004 | + AC_DEFINE(SDL_CDROM_MACOSX,1,"") | ||
1005 | SOURCES="$SOURCES $srcdir/src/cdrom/macosx/*.c" | ||
1006 | have_cdrom=yes | ||
1007 | fi | ||
1008 | # Set up files for the timer library | ||
1009 | if test x$enable_timers = xyes; then | ||
1010 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
1011 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
1012 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
1013 | have_timers=yes | ||
1014 | fi | ||
1015 | @@ -2775,30 +2775,30 @@ case "$host" in | ||
1016 | # Set up files for the audio library | ||
1017 | if test x$enable_threads = xyes -a x$enable_pth = xyes; then | ||
1018 | if test x$enable_audio = xyes; then | ||
1019 | - AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO) | ||
1020 | + AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"") | ||
1021 | SOURCES="$SOURCES $srcdir/src/audio/sun/*.c" | ||
1022 | have_audio=yes | ||
1023 | fi | ||
1024 | fi | ||
1025 | # Set up files for the joystick library | ||
1026 | if test x$enable_joystick = xyes; then | ||
1027 | - AC_DEFINE(SDL_JOYSTICK_MINT) | ||
1028 | + AC_DEFINE(SDL_JOYSTICK_MINT,1,"") | ||
1029 | SOURCES="$SOURCES $srcdir/src/joystick/mint/*.c" | ||
1030 | have_joystick=yes | ||
1031 | fi | ||
1032 | # Set up files for the cdrom library | ||
1033 | if test x$enable_cdrom = xyes; then | ||
1034 | - AC_DEFINE(SDL_CDROM_MINT) | ||
1035 | + AC_DEFINE(SDL_CDROM_MINT,1,"") | ||
1036 | SOURCES="$SOURCES $srcdir/src/cdrom/mint/*.c" | ||
1037 | have_cdrom=yes | ||
1038 | fi | ||
1039 | # Set up files for the timer library | ||
1040 | if test x$enable_timers = xyes; then | ||
1041 | if test x$enable_threads = xyes -a x$enable_pth = xyes; then | ||
1042 | - AC_DEFINE(SDL_TIMER_UNIX) | ||
1043 | + AC_DEFINE(SDL_TIMER_UNIX,1,"") | ||
1044 | SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" | ||
1045 | else | ||
1046 | - AC_DEFINE(SDL_TIMER_MINT) | ||
1047 | + AC_DEFINE(SDL_TIMER_MIN,1,""T) | ||
1048 | SOURCES="$SOURCES $srcdir/src/timer/mint/*.c" | ||
1049 | SOURCES="$SOURCES $srcdir/src/timer/mint/*.S" | ||
1050 | fi | ||
1051 | @@ -2811,20 +2811,20 @@ case "$host" in | ||
1052 | CheckPTHREAD | ||
1053 | # Set up files for the video library | ||
1054 | if test x$enable_video = xyes; then | ||
1055 | - AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS) | ||
1056 | + AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS,1,"") | ||
1057 | SOURCES="$SOURCES $srcdir/src/video/riscos/*.c" | ||
1058 | SOURCES="$SOURCES $srcdir/src/video/riscos/*.S" | ||
1059 | have_video=yes | ||
1060 | fi | ||
1061 | # Set up files for the joystick library | ||
1062 | if test x$enable_joystick = xyes; then | ||
1063 | - AC_DEFINE(SDL_JOYSTICK_RISCOS) | ||
1064 | + AC_DEFINE(SDL_JOYSTICK_RISCOS,1,"") | ||
1065 | SOURCES="$SOURCES $srcdir/src/joystick/riscos/*.c" | ||
1066 | have_joystick=yes | ||
1067 | fi | ||
1068 | # Set up files for the timer library | ||
1069 | if test x$enable_timers = xyes; then | ||
1070 | - AC_DEFINE(SDL_TIMER_RISCOS) | ||
1071 | + AC_DEFINE(SDL_TIMER_RISCOS,1,"") | ||
1072 | SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c" | ||
1073 | have_timers=yes | ||
1074 | fi | ||
1075 | @@ -2846,31 +2846,31 @@ CheckWarnAll | ||
1076 | if test x$enable_joystick = xyes; then | ||
1077 | if test x$have_joystick != xyes; then | ||
1078 | # Wants joystick subsystem, but doesn't have a platform-specific backend... | ||
1079 | - AC_DEFINE(SDL_JOYSTICK_DUMMY) | ||
1080 | + AC_DEFINE(SDL_JOYSTICK_DUMMY,1,"") | ||
1081 | SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c" | ||
1082 | fi | ||
1083 | fi | ||
1084 | if test x$have_cdrom != xyes; then | ||
1085 | if test x$enable_cdrom = xyes; then | ||
1086 | - AC_DEFINE(SDL_CDROM_DISABLED) | ||
1087 | + AC_DEFINE(SDL_CDROM_DISABLED,1,"") | ||
1088 | fi | ||
1089 | SOURCES="$SOURCES $srcdir/src/cdrom/dummy/*.c" | ||
1090 | fi | ||
1091 | if test x$have_threads != xyes; then | ||
1092 | if test x$enable_threads = xyes; then | ||
1093 | - AC_DEFINE(SDL_THREADS_DISABLED) | ||
1094 | + AC_DEFINE(SDL_THREADS_DISABLED,1,"") | ||
1095 | fi | ||
1096 | SOURCES="$SOURCES $srcdir/src/thread/generic/*.c" | ||
1097 | fi | ||
1098 | if test x$have_timers != xyes; then | ||
1099 | if test x$enable_timers = xyes; then | ||
1100 | - AC_DEFINE(SDL_TIMERS_DISABLED) | ||
1101 | + AC_DEFINE(SDL_TIMERS_DISABLED,1,"") | ||
1102 | fi | ||
1103 | SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c" | ||
1104 | fi | ||
1105 | if test x$have_loadso != xyes; then | ||
1106 | if test x$enable_loadso = xyes; then | ||
1107 | - AC_DEFINE(SDL_LOADSO_DISABLED) | ||
1108 | + AC_DEFINE(SDL_LOADSO_DISABLED,1,"") | ||
1109 | fi | ||
1110 | SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c" | ||
1111 | fi | ||
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch new file mode 100644 index 0000000000..f98b927522 --- /dev/null +++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | libX11-1.5.99.901 has changed prototype of _XData32 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | <http://bugzilla.libsdl.org/show_bug.cgi?id=1769> | ||
5 | |||
6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
7 | |||
8 | diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h | ||
9 | --- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800 | ||
10 | +++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100 | ||
11 | @@ -165,7 +165,7 @@ | ||
12 | */ | ||
13 | #ifdef LONG64 | ||
14 | SDL_X11_MODULE(IO_32BIT) | ||
15 | -SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) | ||
16 | +SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) | ||
17 | SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) | ||
18 | #endif | ||
19 | |||
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch new file mode 100644 index 0000000000..913baa92a0 --- /dev/null +++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch | |||
@@ -0,0 +1,187 @@ | |||
1 | Rather than code which doesn't even work properly when cross compiling, | ||
2 | lets just use pkg-config instead. Its a little simpler. | ||
3 | |||
4 | RP 2014/6/20 | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: SDL-1.2.15/sdl.m4 | ||
9 | =================================================================== | ||
10 | --- SDL-1.2.15.orig/sdl.m4 | ||
11 | +++ SDL-1.2.15/sdl.m4 | ||
12 | @@ -12,174 +12,8 @@ dnl Test for SDL, and define SDL_CFLAGS | ||
13 | dnl | ||
14 | AC_DEFUN([AM_PATH_SDL], | ||
15 | [dnl | ||
16 | -dnl Get the cflags and libraries from the sdl-config script | ||
17 | -dnl | ||
18 | -AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], | ||
19 | - sdl_prefix="$withval", sdl_prefix="") | ||
20 | -AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], | ||
21 | - sdl_exec_prefix="$withval", sdl_exec_prefix="") | ||
22 | -AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], | ||
23 | - , enable_sdltest=yes) | ||
24 | - | ||
25 | - if test x$sdl_exec_prefix != x ; then | ||
26 | - sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" | ||
27 | - if test x${SDL_CONFIG+set} != xset ; then | ||
28 | - SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config | ||
29 | - fi | ||
30 | - fi | ||
31 | - if test x$sdl_prefix != x ; then | ||
32 | - sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" | ||
33 | - if test x${SDL_CONFIG+set} != xset ; then | ||
34 | - SDL_CONFIG=$sdl_prefix/bin/sdl-config | ||
35 | - fi | ||
36 | - fi | ||
37 | - | ||
38 | - as_save_PATH="$PATH" | ||
39 | - if test "x$prefix" != xNONE; then | ||
40 | - PATH="$prefix/bin:$prefix/usr/bin:$PATH" | ||
41 | - fi | ||
42 | - AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) | ||
43 | - PATH="$as_save_PATH" | ||
44 | min_sdl_version=ifelse([$1], ,0.11.0,$1) | ||
45 | - AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) | ||
46 | - no_sdl="" | ||
47 | - if test "$SDL_CONFIG" = "no" ; then | ||
48 | - no_sdl=yes | ||
49 | - else | ||
50 | - SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` | ||
51 | - SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` | ||
52 | - | ||
53 | - sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ | ||
54 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | ||
55 | - sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \ | ||
56 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | ||
57 | - sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ | ||
58 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | ||
59 | - if test "x$enable_sdltest" = "xyes" ; then | ||
60 | - ac_save_CFLAGS="$CFLAGS" | ||
61 | - ac_save_CXXFLAGS="$CXXFLAGS" | ||
62 | - ac_save_LIBS="$LIBS" | ||
63 | - CFLAGS="$CFLAGS $SDL_CFLAGS" | ||
64 | - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" | ||
65 | - LIBS="$LIBS $SDL_LIBS" | ||
66 | -dnl | ||
67 | -dnl Now check if the installed SDL is sufficiently new. (Also sanity | ||
68 | -dnl checks the results of sdl-config to some extent | ||
69 | -dnl | ||
70 | - rm -f conf.sdltest | ||
71 | - AC_TRY_RUN([ | ||
72 | -#include <stdio.h> | ||
73 | -#include <stdlib.h> | ||
74 | -#include <string.h> | ||
75 | -#include "SDL.h" | ||
76 | - | ||
77 | -char* | ||
78 | -my_strdup (char *str) | ||
79 | -{ | ||
80 | - char *new_str; | ||
81 | - | ||
82 | - if (str) | ||
83 | - { | ||
84 | - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); | ||
85 | - strcpy (new_str, str); | ||
86 | - } | ||
87 | - else | ||
88 | - new_str = NULL; | ||
89 | - | ||
90 | - return new_str; | ||
91 | -} | ||
92 | - | ||
93 | -int main (int argc, char *argv[]) | ||
94 | -{ | ||
95 | - int major, minor, micro; | ||
96 | - char *tmp_version; | ||
97 | - | ||
98 | - /* This hangs on some systems (?) | ||
99 | - system ("touch conf.sdltest"); | ||
100 | - */ | ||
101 | - { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } | ||
102 | - | ||
103 | - /* HP/UX 9 (%@#!) writes to sscanf strings */ | ||
104 | - tmp_version = my_strdup("$min_sdl_version"); | ||
105 | - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | ||
106 | - printf("%s, bad version string\n", "$min_sdl_version"); | ||
107 | - exit(1); | ||
108 | - } | ||
109 | - | ||
110 | - if (($sdl_major_version > major) || | ||
111 | - (($sdl_major_version == major) && ($sdl_minor_version > minor)) || | ||
112 | - (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) | ||
113 | - { | ||
114 | - return 0; | ||
115 | - } | ||
116 | - else | ||
117 | - { | ||
118 | - printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); | ||
119 | - printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); | ||
120 | - printf("*** best to upgrade to the required version.\n"); | ||
121 | - printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); | ||
122 | - printf("*** to point to the correct copy of sdl-config, and remove the file\n"); | ||
123 | - printf("*** config.cache before re-running configure\n"); | ||
124 | - return 1; | ||
125 | - } | ||
126 | -} | ||
127 | - | ||
128 | -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | ||
129 | - CFLAGS="$ac_save_CFLAGS" | ||
130 | - CXXFLAGS="$ac_save_CXXFLAGS" | ||
131 | - LIBS="$ac_save_LIBS" | ||
132 | - fi | ||
133 | - fi | ||
134 | - if test "x$no_sdl" = x ; then | ||
135 | - AC_MSG_RESULT(yes) | ||
136 | - ifelse([$2], , :, [$2]) | ||
137 | - else | ||
138 | - AC_MSG_RESULT(no) | ||
139 | - if test "$SDL_CONFIG" = "no" ; then | ||
140 | - echo "*** The sdl-config script installed by SDL could not be found" | ||
141 | - echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" | ||
142 | - echo "*** your path, or set the SDL_CONFIG environment variable to the" | ||
143 | - echo "*** full path to sdl-config." | ||
144 | - else | ||
145 | - if test -f conf.sdltest ; then | ||
146 | - : | ||
147 | - else | ||
148 | - echo "*** Could not run SDL test program, checking why..." | ||
149 | - CFLAGS="$CFLAGS $SDL_CFLAGS" | ||
150 | - CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" | ||
151 | - LIBS="$LIBS $SDL_LIBS" | ||
152 | - AC_TRY_LINK([ | ||
153 | -#include <stdio.h> | ||
154 | -#include "SDL.h" | ||
155 | - | ||
156 | -int main(int argc, char *argv[]) | ||
157 | -{ return 0; } | ||
158 | -#undef main | ||
159 | -#define main K_and_R_C_main | ||
160 | -], [ return 0; ], | ||
161 | - [ echo "*** The test program compiled, but did not run. This usually means" | ||
162 | - echo "*** that the run-time linker is not finding SDL or finding the wrong" | ||
163 | - echo "*** version of SDL. If it is not finding SDL, you'll need to set your" | ||
164 | - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | ||
165 | - echo "*** to the installed location Also, make sure you have run ldconfig if that" | ||
166 | - echo "*** is required on your system" | ||
167 | - echo "***" | ||
168 | - echo "*** If you have an old version installed, it is best to remove it, although" | ||
169 | - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], | ||
170 | - [ echo "*** The test program failed to compile or link. See the file config.log for the" | ||
171 | - echo "*** exact error that occured. This usually means SDL was incorrectly installed" | ||
172 | - echo "*** or that you have moved SDL since it was installed. In the latter case, you" | ||
173 | - echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) | ||
174 | - CFLAGS="$ac_save_CFLAGS" | ||
175 | - CXXFLAGS="$ac_save_CXXFLAGS" | ||
176 | - LIBS="$ac_save_LIBS" | ||
177 | - fi | ||
178 | - fi | ||
179 | - SDL_CFLAGS="" | ||
180 | - SDL_LIBS="" | ||
181 | - ifelse([$3], , :, [$3]) | ||
182 | - fi | ||
183 | + PKG_CHECK_MODULES([SDL], [sdl >= $min_sdl_version]) | ||
184 | AC_SUBST(SDL_CFLAGS) | ||
185 | AC_SUBST(SDL_LIBS) | ||
186 | - rm -f conf.sdltest | ||
187 | ]) | ||