configure.in
changeset 5062 e8916fe9cfc8
parent 5050 2add0d17180b
child 5066 3afb71c202b2
     1.1 --- a/configure.in	Thu Jan 20 17:33:06 2011 -0800
     1.2 +++ b/configure.in	Thu Jan 20 18:04:05 2011 -0800
     1.3 @@ -1645,8 +1645,8 @@
     1.4  }
     1.5  
     1.6  
     1.7 -dnl Check for Win32 OpenGL
     1.8 -CheckWIN32GL()
     1.9 +dnl Check for Windows OpenGL
    1.10 +CheckWINDOWSGL()
    1.11  {
    1.12      if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
    1.13          AC_DEFINE(SDL_VIDEO_OPENGL)
    1.14 @@ -1906,10 +1906,10 @@
    1.15      fi
    1.16  }
    1.17  
    1.18 -dnl Determine whether the compiler can produce Win32 executables
    1.19 -CheckWIN32()
    1.20 +dnl Determine whether the compiler can produce Windows executables
    1.21 +CheckWINDOWS()
    1.22  {
    1.23 -    AC_MSG_CHECKING(Win32 compiler)
    1.24 +    AC_MSG_CHECKING(Windows compiler)
    1.25      have_win32_gcc=no
    1.26      AC_TRY_COMPILE([
    1.27       #include <windows.h>
    1.28 @@ -1920,7 +1920,7 @@
    1.29      AC_MSG_RESULT($have_win32_gcc)
    1.30      if test x$have_win32_gcc != xyes; then
    1.31         AC_MSG_ERROR([
    1.32 -*** Your compiler ($CC) does not produce Win32 executables!
    1.33 +*** Your compiler ($CC) does not produce Windows executables!
    1.34         ])
    1.35      fi
    1.36  
    1.37 @@ -1938,7 +1938,7 @@
    1.38  
    1.39      dnl See if the user wants to redirect standard output to files
    1.40      AC_ARG_ENABLE(stdio-redirect,
    1.41 -AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Win32 [[default=yes]]]),
    1.42 +AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Windows [[default=yes]]]),
    1.43                    , enable_stdio_redirect=yes)
    1.44      if test x$enable_stdio_redirect != xyes; then
    1.45          EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT"
    1.46 @@ -1949,7 +1949,7 @@
    1.47  CheckDIRECTX()
    1.48  {
    1.49      AC_ARG_ENABLE(directx,
    1.50 -AC_HELP_STRING([--enable-directx], [use DirectX for Win32 audio/video [[default=yes]]]),
    1.51 +AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[default=yes]]]),
    1.52                    , enable_directx=yes)
    1.53      if test x$enable_directx = xyes; then
    1.54          AC_CHECK_HEADER(d3d9.h, have_d3d=yes)
    1.55 @@ -2332,10 +2332,10 @@
    1.56          CheckDummyVideo
    1.57          CheckDiskAudio
    1.58          CheckDummyAudio
    1.59 -        CheckWIN32
    1.60 +        CheckWINDOWS
    1.61          if test x$enable_video = xyes; then
    1.62 -            AC_DEFINE(SDL_VIDEO_DRIVER_WIN32)
    1.63 -            SOURCES="$SOURCES $srcdir/src/video/win32/*.c"
    1.64 +            AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
    1.65 +            SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
    1.66              have_video=yes
    1.67              AC_ARG_ENABLE(render-gdi,
    1.68  AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
    1.69 @@ -2381,10 +2381,10 @@
    1.70          fi
    1.71          # Set up files for the thread library
    1.72          if test x$enable_threads = xyes; then
    1.73 -            AC_DEFINE(SDL_THREAD_WIN32)
    1.74 -            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
    1.75 -            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
    1.76 -            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
    1.77 +            AC_DEFINE(SDL_THREAD_WINDOWS)
    1.78 +            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c"
    1.79 +            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c"
    1.80 +            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c"
    1.81              SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
    1.82              have_threads=yes
    1.83          fi
    1.84 @@ -2396,8 +2396,8 @@
    1.85          fi
    1.86          # Set up files for the shared object loading library
    1.87          if test x$enable_loadso = xyes; then
    1.88 -            AC_DEFINE(SDL_LOADSO_WIN32)
    1.89 -            SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
    1.90 +            AC_DEFINE(SDL_LOADSO_WINDOWS)
    1.91 +            SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c"
    1.92              have_loadso=yes
    1.93          fi
    1.94          # Set up the system libraries we need
    1.95 @@ -2412,8 +2412,8 @@
    1.96          	;;
    1.97  	esac
    1.98  
    1.99 -        # The Win32 platform requires special setup
   1.100 -        SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
   1.101 +        # The Windows platform requires special setup
   1.102 +        SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
   1.103          EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
   1.104          EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS"
   1.105          ;;
   1.106 @@ -2431,13 +2431,13 @@
   1.107          CheckDummyVideo
   1.108          CheckDiskAudio
   1.109          CheckDummyAudio
   1.110 -        CheckWIN32
   1.111 -        CheckWIN32GL
   1.112 +        CheckWINDOWS
   1.113 +        CheckWINDOWSGL
   1.114          CheckDIRECTX
   1.115          # Set up files for the video library
   1.116          if test x$enable_video = xyes; then
   1.117 -            AC_DEFINE(SDL_VIDEO_DRIVER_WIN32)
   1.118 -            SOURCES="$SOURCES $srcdir/src/video/win32/*.c"
   1.119 +            AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS)
   1.120 +            SOURCES="$SOURCES $srcdir/src/video/windows/*.c"
   1.121              have_video=yes
   1.122              AC_ARG_ENABLE(render-gdi,
   1.123  AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]),
   1.124 @@ -2466,18 +2466,18 @@
   1.125          if test x$enable_joystick = xyes; then
   1.126              if test x$have_dinput = xyes; then
   1.127                  AC_DEFINE(SDL_JOYSTICK_DINPUT)
   1.128 -                SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
   1.129 +                SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_dxjoystick.c"
   1.130                  EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
   1.131              else
   1.132                  AC_DEFINE(SDL_JOYSTICK_WINMM)
   1.133 -                SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c"
   1.134 +                SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_mmjoystick.c"
   1.135              fi
   1.136              have_joystick=yes
   1.137          fi
   1.138          if test x$enable_haptic = xyes; then
   1.139              if test x$have_dinput = xyes; then
   1.140                  AC_DEFINE(SDL_HAPTIC_DINPUT)
   1.141 -                SOURCES="$SOURCES $srcdir/src/haptic/win32/SDL_syshaptic.c"
   1.142 +                SOURCES="$SOURCES $srcdir/src/haptic/windows/SDL_syshaptic.c"
   1.143                  have_haptic=yes
   1.144              fi
   1.145          fi
   1.146 @@ -2488,23 +2488,23 @@
   1.147          fi
   1.148          # Set up files for the thread library
   1.149          if test x$enable_threads = xyes; then
   1.150 -            AC_DEFINE(SDL_THREAD_WIN32)
   1.151 -            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
   1.152 -            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
   1.153 -            SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
   1.154 +            AC_DEFINE(SDL_THREAD_WINDOWS)
   1.155 +            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c"
   1.156 +            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c"
   1.157 +            SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c"
   1.158              SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
   1.159              have_threads=yes
   1.160          fi
   1.161          # Set up files for the timer library
   1.162          if test x$enable_timers = xyes; then
   1.163 -            AC_DEFINE(SDL_TIMER_WIN32)
   1.164 -            SOURCES="$SOURCES $srcdir/src/timer/win32/*.c"
   1.165 +            AC_DEFINE(SDL_TIMER_WINDOWS)
   1.166 +            SOURCES="$SOURCES $srcdir/src/timer/windows/*.c"
   1.167              have_timers=yes
   1.168          fi
   1.169          # Set up files for the shared object loading library
   1.170          if test x$enable_loadso = xyes; then
   1.171 -            AC_DEFINE(SDL_LOADSO_WIN32)
   1.172 -            SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
   1.173 +            AC_DEFINE(SDL_LOADSO_WINDOWS)
   1.174 +            SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c"
   1.175              have_loadso=yes
   1.176          fi
   1.177          # Set up the system libraries we need
   1.178 @@ -2512,9 +2512,9 @@
   1.179          # You can get this here: http://libunicows.sourceforge.net/
   1.180          #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
   1.181          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
   1.182 -        # The Win32 platform requires special setup
   1.183 -        VERSION_SOURCES="$srcdir/src/main/win32/*.rc"
   1.184 -        SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"
   1.185 +        # The Windows platform requires special setup
   1.186 +        VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
   1.187 +        SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
   1.188          SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
   1.189          SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
   1.190          ;;