comparison configure.in @ 1712:931d111e737a SDL-1.3

Started framework for Windows video driver
author Sam Lantinga <slouken@libsdl.org>
date Mon, 26 Jun 2006 13:56:56 +0000
parents 865ba39fc96d
children b025e419d344
comparison
equal deleted inserted replaced
1711:865ba39fc96d 1712:931d111e737a
1859 if test x$enable_stdio_redirect != xyes; then 1859 if test x$enable_stdio_redirect != xyes; then
1860 EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT" 1860 EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT"
1861 fi 1861 fi
1862 1862
1863 if test x$enable_video = xyes; then 1863 if test x$enable_video = xyes; then
1864 AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB) 1864 AC_DEFINE(SDL_VIDEO_DRIVER_WIN32)
1865 SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c" 1865 SOURCES="$SOURCES $srcdir/src/video/win32/*.c"
1866 SOURCES="$SOURCES $srcdir/src/video/windib/*.c"
1867 have_video=yes 1866 have_video=yes
1868 fi 1867 fi
1869 } 1868 }
1870 1869
1871 dnl Find the DirectX includes and libraries 1870 dnl Find the DirectX includes and libraries
1873 { 1872 {
1874 AC_ARG_ENABLE(directx, 1873 AC_ARG_ENABLE(directx,
1875 AC_HELP_STRING([--enable-directx], [use DirectX for Win32 audio/video [[default=yes]]]), 1874 AC_HELP_STRING([--enable-directx], [use DirectX for Win32 audio/video [[default=yes]]]),
1876 , enable_directx=yes) 1875 , enable_directx=yes)
1877 if test x$enable_directx = xyes; then 1876 if test x$enable_directx = xyes; then
1878 have_directx=no
1879 AC_CHECK_HEADER(ddraw.h, have_ddraw=yes)
1880 AC_CHECK_HEADER(dsound.h, have_dsound=yes) 1877 AC_CHECK_HEADER(dsound.h, have_dsound=yes)
1881 AC_CHECK_HEADER(dinput.h, use_dinput=yes) 1878 AC_CHECK_HEADER(dinput.h, use_dinput=yes)
1882 if test x$have_ddraw = xyes -a x$have_dsound = xyes -a x$use_dinput = xyes; then
1883 have_directx=yes
1884 fi
1885 if test x$enable_video = xyes -a x$have_directx = xyes; then
1886 AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW)
1887 SOURCES="$SOURCES $srcdir/src/video/windx5/*.c"
1888 have_video=yes
1889 fi
1890 fi 1879 fi
1891 } 1880 }
1892 1881
1893 dnl Check for the dlfcn.h interface for dynamically loading objects 1882 dnl Check for the dlfcn.h interface for dynamically loading objects
1894 CheckDLOPEN() 1883 CheckDLOPEN()
2309 CheckNASM 2298 CheckNASM
2310 # Set up files for the audio library 2299 # Set up files for the audio library
2311 if test x$enable_audio = xyes; then 2300 if test x$enable_audio = xyes; then
2312 AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT) 2301 AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT)
2313 SOURCES="$SOURCES $srcdir/src/audio/windib/*.c" 2302 SOURCES="$SOURCES $srcdir/src/audio/windib/*.c"
2314 if test x$have_directx = xyes; then 2303 if test x$have_dsound = xyes; then
2315 AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND) 2304 AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)
2316 SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c" 2305 SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c"
2317 fi 2306 fi
2318 have_audio=yes 2307 have_audio=yes
2319 fi 2308 fi
2320 # Set up files for the joystick library 2309 # Set up files for the joystick library
2321 if test x$enable_joystick = xyes; then 2310 if test x$enable_joystick = xyes; then
2322 if test x$have_directx = xyes; then 2311 if test x$have_dinput = xyes; then
2323 AC_DEFINE(SDL_JOYSTICK_DINPUT) 2312 AC_DEFINE(SDL_JOYSTICK_DINPUT)
2324 SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c" 2313 SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
2325 else 2314 else
2326 AC_DEFINE(SDL_JOYSTICK_WINMM) 2315 AC_DEFINE(SDL_JOYSTICK_WINMM)
2327 SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c" 2316 SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c"
2355 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" 2344 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
2356 have_loadso=yes 2345 have_loadso=yes
2357 fi 2346 fi
2358 # Set up the system libraries we need 2347 # Set up the system libraries we need
2359 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm" 2348 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm"
2360 if test x$have_directx = xyes; then
2361 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldxguid"
2362 fi
2363 # The Win32 platform requires special setup 2349 # The Win32 platform requires special setup
2364 SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c" 2350 SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
2365 SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" 2351 SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
2366 SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows" 2352 SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
2367 ;; 2353 ;;