1320 ],[ |
1319 ],[ |
1321 use_directx=yes |
1320 use_directx=yes |
1322 ]) |
1321 ]) |
1323 AC_MSG_RESULT($use_directx) |
1322 AC_MSG_RESULT($use_directx) |
1324 fi |
1323 fi |
1325 AM_CONDITIONAL(USE_DIRECTX, test x$use_directx = xyes) |
|
1326 |
1324 |
1327 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/wincommon" |
1325 CFLAGS="$CFLAGS -I\$(top_srcdir)/src/video/wincommon" |
1328 SYSTEM_LIBS="$SYSTEM_LIBS -luser32 -lgdi32 -lwinmm" |
1326 SYSTEM_LIBS="$SYSTEM_LIBS -luser32 -lgdi32 -lwinmm" |
1329 VIDEO_SUBDIRS="$VIDEO_SUBDIRS wincommon" |
1327 VIDEO_SUBDIRS="$VIDEO_SUBDIRS wincommon" |
1330 VIDEO_DRIVERS="$VIDEO_DRIVERS wincommon/libvideo_wincommon.la" |
1328 VIDEO_DRIVERS="$VIDEO_DRIVERS wincommon/libvideo_wincommon.la" |
2342 fi |
2340 fi |
2343 # Set up files for the joystick library |
2341 # Set up files for the joystick library |
2344 if test x$enable_joystick = xyes; then |
2342 if test x$enable_joystick = xyes; then |
2345 JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS darwin" |
2343 JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS darwin" |
2346 JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS darwin/libjoystick_darwin.la" |
2344 JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS darwin/libjoystick_darwin.la" |
2347 SDL_LIBS="$SDL_LIBS -framework IOKit" |
2345 SYSTEM_LIBS="$SYSTEM_LIBS -framework IOKit" |
2348 fi |
2346 fi |
2349 # Set up files for the cdrom library |
2347 # Set up files for the cdrom library |
2350 if test x$enable_cdrom = xyes; then |
2348 if test x$enable_cdrom = xyes; then |
2351 CDROM_SUBDIRS="$CDROM_SUBDIRS dummy" |
2349 CDROM_SUBDIRS="$CDROM_SUBDIRS dummy" |
2352 CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la" |
2350 CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la" |
2368 fi |
2366 fi |
2369 # Set up files for the timer library |
2367 # Set up files for the timer library |
2370 if test x$enable_timers = xyes; then |
2368 if test x$enable_timers = xyes; then |
2371 COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c) |
2369 COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c) |
2372 fi |
2370 fi |
2373 # The MacOS X platform requires special setup |
2371 # The MacOS X platform requires special setup. |
2374 SDL_CFLAGS="$SDL_CFLAGS -F/System/Library/Frameworks/Carbon.framework -F/System/Library/Frameworks/Cocoa.framework" |
2372 SDL_LIBS="-lSDLmain $SDL_LIBS" |
2375 SDL_LIBS="-lSDLmain $SDL_LIBS -framework Carbon -framework Cocoa" |
2373 # The Cocoa backend still needs Carbon, and the YUV code QuickTime |
|
2374 SYSTEM_LIBS="$SYSTEM_LIBS -framework Cocoa -framework Carbon -framework QuickTime" |
2376 ;; |
2375 ;; |
2377 *-*-mint*) |
2376 *-*-mint*) |
2378 ARCH=mint |
2377 ARCH=mint |
2379 CheckDummyVideo |
2378 CheckDummyVideo |
2380 CheckDiskAudio |
2379 CheckDiskAudio |
2449 AM_CONDITIONAL(TARGET_MACOS, test $ARCH = macos) |
2448 AM_CONDITIONAL(TARGET_MACOS, test $ARCH = macos) |
2450 AM_CONDITIONAL(TARGET_MACOSX, test $ARCH = macosx) |
2449 AM_CONDITIONAL(TARGET_MACOSX, test $ARCH = macosx) |
2451 AM_CONDITIONAL(TARGET_QNX, test $ARCH = qnx) |
2450 AM_CONDITIONAL(TARGET_QNX, test $ARCH = qnx) |
2452 AM_CONDITIONAL(TARGET_MINT, test $ARCH = mint) |
2451 AM_CONDITIONAL(TARGET_MINT, test $ARCH = mint) |
2453 |
2452 |
|
2453 # More automake conditionals |
|
2454 AM_CONDITIONAL(USE_DIRECTX, test x$use_directx = xyes) |
|
2455 AM_CONDITIONAL(USE_CLONE, test x$use_clone = xyes) |
|
2456 |
2454 # Set conditional variables for shared and static library selection. |
2457 # Set conditional variables for shared and static library selection. |
2455 # These are not used in any Makefile.am but in sdl-config.in. |
2458 # These are not used in any Makefile.am but in sdl-config.in. |
2456 AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = yes]) |
2459 AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = yes]) |
2457 AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes]) |
2460 AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes]) |
2458 |
2461 |
2462 SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib" |
2465 SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib" |
2463 fi |
2466 fi |
2464 if test $ARCH = solaris; then |
2467 if test $ARCH = solaris; then |
2465 SDL_RLD_FLAGS="-R\${exec_prefix}/lib" |
2468 SDL_RLD_FLAGS="-R\${exec_prefix}/lib" |
2466 fi |
2469 fi |
2467 if test $ARCH = openbsd -o $ARCH = bsdi; then |
2470 |
|
2471 case "$ARCH" in |
|
2472 openbsd | bsdi) |
2468 SHARED_SYSTEM_LIBS="$SYSTEM_LIBS" |
2473 SHARED_SYSTEM_LIBS="$SYSTEM_LIBS" |
2469 else |
2474 ;; |
|
2475 macosx) |
|
2476 SHARED_SYSTEM_LIBS="-framework Cocoa" |
|
2477 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then |
|
2478 SHARED_SYSTEM_LIBS="$SHARED_SYSTEM_LIBS -framework OpenGL" |
|
2479 fi |
|
2480 ;; |
|
2481 *) |
2470 SHARED_SYSTEM_LIBS="" |
2482 SHARED_SYSTEM_LIBS="" |
2471 fi |
2483 ;; |
|
2484 esac |
|
2485 |
2472 STATIC_SYSTEM_LIBS="$SYSTEM_LIBS" |
2486 STATIC_SYSTEM_LIBS="$SYSTEM_LIBS" |
2473 |
2487 |
2474 dnl Output the video drivers we use |
2488 dnl Output the video drivers we use |
2475 if test x$enable_video = xtrue; then |
2489 if test x$enable_video = xtrue; then |
2476 if test "$VIDEO_SUBDIRS" = ""; then |
2490 if test "$VIDEO_SUBDIRS" = ""; then |