Mercurial > sdl-ios-xcode

comparison configure.in @ 5062:e8916fe9cfc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bug #925 Changed "win32" to "windows"
author Sam Lantinga <slouken@libsdl.org>
date Thu, 20 Jan 2011 18:04:05 -0800
parents 2add0d17180b
children 3afb71c202b2
comparison
equal deleted inserted replaced
5061:9e9940eae455 5062:e8916fe9cfc8
1643 fi 1643 fi
1644 fi 1644 fi
1645 } 1645 }
1646 1646
1647 1647
1648 dnl Check for Win32 OpenGL 1648 dnl Check for Windows OpenGL
1649 CheckWIN32GL() 1649 CheckWINDOWSGL()
1650 { 1650 {
1651 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then 1651 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
1652 AC_DEFINE(SDL_VIDEO_OPENGL) 1652 AC_DEFINE(SDL_VIDEO_OPENGL)
1653 AC_DEFINE(SDL_VIDEO_OPENGL_WGL) 1653 AC_DEFINE(SDL_VIDEO_OPENGL_WGL)
1654 AC_DEFINE(SDL_VIDEO_RENDER_OGL) 1654 AC_DEFINE(SDL_VIDEO_RENDER_OGL)
1904 have_threads=yes 1904 have_threads=yes
1905 fi 1905 fi
1906 fi 1906 fi
1907 } 1907 }
1908 1908
1909 dnl Determine whether the compiler can produce Win32 executables 1909 dnl Determine whether the compiler can produce Windows executables
1910 CheckWIN32() 1910 CheckWINDOWS()
1911 { 1911 {
1912 AC_MSG_CHECKING(Win32 compiler) 1912 AC_MSG_CHECKING(Windows compiler)
1913 have_win32_gcc=no 1913 have_win32_gcc=no
1914 AC_TRY_COMPILE([ 1914 AC_TRY_COMPILE([
1915 #include <windows.h> 1915 #include <windows.h>
1916 ],[ 1916 ],[
1917 ],[ 1917 ],[
1918 have_win32_gcc=yes 1918 have_win32_gcc=yes
1919 ]) 1919 ])
1920 AC_MSG_RESULT($have_win32_gcc) 1920 AC_MSG_RESULT($have_win32_gcc)
1921 if test x$have_win32_gcc != xyes; then 1921 if test x$have_win32_gcc != xyes; then
1922 AC_MSG_ERROR([ 1922 AC_MSG_ERROR([
1923 *** Your compiler ($CC) does not produce Win32 executables! 1923 *** Your compiler ($CC) does not produce Windows executables!
1924 ]) 1924 ])
1925 fi 1925 fi
1926 1926
1927 AC_MSG_CHECKING(Windows CE) 1927 AC_MSG_CHECKING(Windows CE)
1928 have_wince=no 1928 have_wince=no
1936 ]) 1936 ])
1937 AC_MSG_RESULT($have_wince) 1937 AC_MSG_RESULT($have_wince)
1938 1938
1939 dnl See if the user wants to redirect standard output to files 1939 dnl See if the user wants to redirect standard output to files
1940 AC_ARG_ENABLE(stdio-redirect, 1940 AC_ARG_ENABLE(stdio-redirect,
1941 AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Win32 [[default=yes]]]), 1941 AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Windows [[default=yes]]]),
1942 , enable_stdio_redirect=yes) 1942 , enable_stdio_redirect=yes)
1943 if test x$enable_stdio_redirect != xyes; then 1943 if test x$enable_stdio_redirect != xyes; then
1944 EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT" 1944 EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT"
1945 fi 1945 fi
1946 } 1946 }
1947 1947
1948 dnl Find the DirectX includes and libraries 1948 dnl Find the DirectX includes and libraries
1949 CheckDIRECTX() 1949 CheckDIRECTX()
1950 { 1950 {
1951 AC_ARG_ENABLE(directx, 1951 AC_ARG_ENABLE(directx,
1952 AC_HELP_STRING([--enable-directx], [use DirectX for Win32 audio/video [[default=yes]]]), 1952 AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[default=yes]]]),
1953 , enable_directx=yes) 1953 , enable_directx=yes)
1954 if test x$enable_directx = xyes; then 1954 if test x$enable_directx = xyes; then
1955 AC_CHECK_HEADER(d3d9.h, have_d3d=yes) 1955 AC_CHECK_HEADER(d3d9.h, have_d3d=yes)
1956 AC_CHECK_HEADER(ddraw.h, have_ddraw=yes) 1956 AC_CHECK_HEADER(ddraw.h, have_ddraw=yes)
1957 AC_CHECK_HEADER(dsound.h, have_dsound=yes) 1957 AC_CHECK_HEADER(dsound.h, have_dsound=yes)
2330 *-wince* | *-mingw32ce) 2330 *-wince* | *-mingw32ce)
2331 ARCH=win32 2331 ARCH=win32
2332 CheckDummyVideo 2332 CheckDummyVideo
2333 CheckDiskAudio 2333 CheckDiskAudio
2334 CheckDummyAudio 2334 CheckDummyAudio
2335 CheckWIN32 2335 CheckWINDOWS
2336 if test x$enable_video = xyes; then 2336 if test x$enable_video = xyes; then
2337 AC_DEFINE(SDL_VIDEO_DRIVER_WIN32) 2337 AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
2338 SOURCES="$SOURCES $srcdir/src/video/win32/*.c" 2338 SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
2339 have_video=yes 2339 have_video=yes
2340 AC_ARG_ENABLE(render-gdi, 2340 AC_ARG_ENABLE(render-gdi,
2341 AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]), 2341 AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
2342 , enable_render_gdi=yes) 2342 , enable_render_gdi=yes)
2343 if test x$enable_render_gdi = xyes; then 2343 if test x$enable_render_gdi = xyes; then
2379 SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c" 2379 SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
2380 have_joystick=yes 2380 have_joystick=yes
2381 fi 2381 fi
2382 # Set up files for the thread library 2382 # Set up files for the thread library
2383 if test x$enable_threads = xyes; then 2383 if test x$enable_threads = xyes; then
2384 AC_DEFINE(SDL_THREAD_WIN32) 2384 AC_DEFINE(SDL_THREAD_WINDOWS)
2385 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" 2385 SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c"
2386 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" 2386 SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c"
2387 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" 2387 SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c"
2388 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" 2388 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
2389 have_threads=yes 2389 have_threads=yes
2390 fi 2390 fi
2391 # Set up files for the timer library 2391 # Set up files for the timer library
2392 if test x$enable_timers = xyes; then 2392 if test x$enable_timers = xyes; then
2394 SOURCES="$SOURCES $srcdir/src/timer/wince/*.c" 2394 SOURCES="$SOURCES $srcdir/src/timer/wince/*.c"
2395 have_timers=yes 2395 have_timers=yes
2396 fi 2396 fi
2397 # Set up files for the shared object loading library 2397 # Set up files for the shared object loading library
2398 if test x$enable_loadso = xyes; then 2398 if test x$enable_loadso = xyes; then
2399 AC_DEFINE(SDL_LOADSO_WIN32) 2399 AC_DEFINE(SDL_LOADSO_WINDOWS)
2400 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" 2400 SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c"
2401 have_loadso=yes 2401 have_loadso=yes
2402 fi 2402 fi
2403 # Set up the system libraries we need 2403 # Set up the system libraries we need
2404 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lcoredll -lcommctrl -lmmtimer" 2404 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lcoredll -lcommctrl -lmmtimer"
2405 2405
2410 ;; 2410 ;;
2411 *) 2411 *)
2412 ;; 2412 ;;
2413 esac 2413 esac
2414 2414
2415 # The Win32 platform requires special setup 2415 # The Windows platform requires special setup
2416 SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c" 2416 SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
2417 EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420" 2417 EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
2418 EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS" 2418 EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS"
2419 ;; 2419 ;;
2420 *-*-cygwin* | *-*-mingw32*) 2420 *-*-cygwin* | *-*-mingw32*)
2421 ARCH=win32 2421 ARCH=win32
2429 fi 2429 fi
2430 fi 2430 fi
2431 CheckDummyVideo 2431 CheckDummyVideo
2432 CheckDiskAudio 2432 CheckDiskAudio
2433 CheckDummyAudio 2433 CheckDummyAudio
2434 CheckWIN32 2434 CheckWINDOWS
2435 CheckWIN32GL 2435 CheckWINDOWSGL
2436 CheckDIRECTX 2436 CheckDIRECTX
2437 # Set up files for the video library 2437 # Set up files for the video library
2438 if test x$enable_video = xyes; then 2438 if test x$enable_video = xyes; then
2439 AC_DEFINE(SDL_VIDEO_DRIVER_WIN32) 2439 AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
2440 SOURCES="$SOURCES $srcdir/src/video/win32/*.c" 2440 SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
2441 have_video=yes 2441 have_video=yes
2442 AC_ARG_ENABLE(render-gdi, 2442 AC_ARG_ENABLE(render-gdi,
2443 AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]), 2443 AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
2444 , enable_render_gdi=yes) 2444 , enable_render_gdi=yes)
2445 if test x$enable_render_gdi = xyes; then 2445 if test x$enable_render_gdi = xyes; then
2464 fi 2464 fi
2465 # Set up files for the joystick library 2465 # Set up files for the joystick library
2466 if test x$enable_joystick = xyes; then 2466 if test x$enable_joystick = xyes; then
2467 if test x$have_dinput = xyes; then 2467 if test x$have_dinput = xyes; then
2468 AC_DEFINE(SDL_JOYSTICK_DINPUT) 2468 AC_DEFINE(SDL_JOYSTICK_DINPUT)
2469 SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c" 2469 SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_dxjoystick.c"
2470 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8" 2470 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
2471 else 2471 else
2472 AC_DEFINE(SDL_JOYSTICK_WINMM) 2472 AC_DEFINE(SDL_JOYSTICK_WINMM)
2473 SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c" 2473 SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_mmjoystick.c"
2474 fi 2474 fi
2475 have_joystick=yes 2475 have_joystick=yes
2476 fi 2476 fi
2477 if test x$enable_haptic = xyes; then 2477 if test x$enable_haptic = xyes; then
2478 if test x$have_dinput = xyes; then 2478 if test x$have_dinput = xyes; then
2479 AC_DEFINE(SDL_HAPTIC_DINPUT) 2479 AC_DEFINE(SDL_HAPTIC_DINPUT)
2480 SOURCES="$SOURCES $srcdir/src/haptic/win32/SDL_syshaptic.c" 2480 SOURCES="$SOURCES $srcdir/src/haptic/windows/SDL_syshaptic.c"
2481 have_haptic=yes 2481 have_haptic=yes
2482 fi 2482 fi
2483 fi 2483 fi
2484 if test x$enable_power = xyes; then 2484 if test x$enable_power = xyes; then
2485 AC_DEFINE(SDL_POWER_WINDOWS) 2485 AC_DEFINE(SDL_POWER_WINDOWS)
2486 SOURCES="$SOURCES $srcdir/src/power/windows/SDL_syspower.c" 2486 SOURCES="$SOURCES $srcdir/src/power/windows/SDL_syspower.c"
2487 have_power=yes 2487 have_power=yes
2488 fi 2488 fi
2489 # Set up files for the thread library 2489 # Set up files for the thread library
2490 if test x$enable_threads = xyes; then 2490 if test x$enable_threads = xyes; then
2491 AC_DEFINE(SDL_THREAD_WIN32) 2491 AC_DEFINE(SDL_THREAD_WINDOWS)
2492 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" 2492 SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c"
2493 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" 2493 SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c"
2494 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" 2494 SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c"
2495 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" 2495 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
2496 have_threads=yes 2496 have_threads=yes
2497 fi 2497 fi
2498 # Set up files for the timer library 2498 # Set up files for the timer library
2499 if test x$enable_timers = xyes; then 2499 if test x$enable_timers = xyes; then
2500 AC_DEFINE(SDL_TIMER_WIN32) 2500 AC_DEFINE(SDL_TIMER_WINDOWS)
2501 SOURCES="$SOURCES $srcdir/src/timer/win32/*.c" 2501 SOURCES="$SOURCES $srcdir/src/timer/windows/*.c"
2502 have_timers=yes 2502 have_timers=yes
2503 fi 2503 fi
2504 # Set up files for the shared object loading library 2504 # Set up files for the shared object loading library
2505 if test x$enable_loadso = xyes; then 2505 if test x$enable_loadso = xyes; then
2506 AC_DEFINE(SDL_LOADSO_WIN32) 2506 AC_DEFINE(SDL_LOADSO_WINDOWS)
2507 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" 2507 SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c"
2508 have_loadso=yes 2508 have_loadso=yes
2509 fi 2509 fi
2510 # Set up the system libraries we need 2510 # Set up the system libraries we need
2511 # SDL 1.3 is unicode, and unicows emulates this on Windows 98/ME 2511 # SDL 1.3 is unicode, and unicows emulates this on Windows 98/ME
2512 # You can get this here: http://libunicows.sourceforge.net/ 2512 # You can get this here: http://libunicows.sourceforge.net/
2513 #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows" 2513 #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
2514 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid" 2514 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
2515 # The Win32 platform requires special setup 2515 # The Windows platform requires special setup
2516 VERSION_SOURCES="$srcdir/src/main/win32/*.rc" 2516 VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
2517 SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c" 2517 SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
2518 SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" 2518 SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
2519 SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows" 2519 SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
2520 ;; 2520 ;;
2521 *-*-beos* | *-*-haiku*) 2521 *-*-beos* | *-*-haiku*)
2522 ARCH=beos 2522 ARCH=beos