configure
changeset 6250 cce0ddcf6747
parent 6235 d169541f5049
child 6303 6bb657898f55
     1.1 --- a/configure	Sun Jan 22 01:29:26 2012 -0500
     1.2 +++ b/configure	Sun Jan 22 17:21:00 2012 -0500
     1.3 @@ -2070,7 +2070,7 @@
     1.4  
     1.5  #
     1.6  # Making releases:
     1.7 -# Edit include/SDL/SDL_version.h and change the version, then:
     1.8 +# Edit include/SDL_version.h and change the version, then:
     1.9  #   SDL_MICRO_VERSION += 1;
    1.10  #   SDL_INTERFACE_AGE += 1;
    1.11  #   SDL_BINARY_AGE += 1;
    1.12 @@ -2078,8 +2078,8 @@
    1.13  # if backwards compatibility has been broken,
    1.14  # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
    1.15  #
    1.16 -SDL_MAJOR_VERSION=1
    1.17 -SDL_MINOR_VERSION=3
    1.18 +SDL_MAJOR_VERSION=2
    1.19 +SDL_MINOR_VERSION=0
    1.20  SDL_MICRO_VERSION=0
    1.21  SDL_INTERFACE_AGE=0
    1.22  SDL_BINARY_AGE=0
    1.23 @@ -15552,7 +15552,7 @@
    1.24  # built with it to be compiled for a particular architecture.
    1.25  #AX_GCC_ARCHFLAG([no], [BASE_CFLAGS="$BASE_CFLAGS $ax_cv_gcc_archflag]")
    1.26  BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DUSING_GENERATED_CONFIG_H"
    1.27 -# The default optimization for SDL 1.3 is -O3 (Bug #31)
    1.28 +# The default optimization for SDL is -O3 (Bug #31)
    1.29  if test x$orig_CFLAGS = x; then
    1.30      BUILD_CFLAGS=`echo $BUILD_CFLAGS | sed 's/-O2/-O3/'`
    1.31  fi
    1.32 @@ -15569,7 +15569,7 @@
    1.33  #    fi
    1.34  #done
    1.35  SDL_CFLAGS="$BASE_CFLAGS"
    1.36 -SDL_LIBS="-lSDL $BASE_LDFLAGS"
    1.37 +SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
    1.38  CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
    1.39  CFLAGS="$CFLAGS $EXTRA_CFLAGS"
    1.40  LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
    1.41 @@ -27471,7 +27471,7 @@
    1.42          # The Windows platform requires special setup
    1.43          SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
    1.44          EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
    1.45 -        EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS"
    1.46 +        EXTRA_LDFLAGS="-lSDL2main $EXTRA_LDFLAGS"
    1.47          ;;
    1.48      *-*-cygwin* | *-*-mingw32*)
    1.49          ARCH=win32
    1.50 @@ -27618,7 +27618,7 @@
    1.51              have_loadso=yes
    1.52          fi
    1.53          # Set up the system libraries we need
    1.54 -        # SDL 1.3 is unicode, and unicows emulates this on Windows 98/ME
    1.55 +        # SDL is unicode, and unicows emulates this on Windows 98/ME
    1.56          # You can get this here: http://libunicows.sourceforge.net/
    1.57          #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
    1.58          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
    1.59 @@ -27626,7 +27626,7 @@
    1.60          VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
    1.61          SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
    1.62          SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
    1.63 -        SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
    1.64 +        SDL_LIBS="-lmingw32 -lSDL2main $SDL_LIBS -mwindows"
    1.65          ;;
    1.66      *-*-beos* | *-*-haiku*)
    1.67          ARCH=beos
    1.68 @@ -27903,7 +27903,7 @@
    1.69  case "$ARCH" in
    1.70    macosx)
    1.71      # Evil hack to allow static linking on Mac OS X
    1.72 -    SDL_STATIC_LIBS="\${libdir}/libSDL.a $EXTRA_LDFLAGS"
    1.73 +    SDL_STATIC_LIBS="\${libdir}/libSDL2.a $EXTRA_LDFLAGS"
    1.74      ;;
    1.75    *)
    1.76      SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
    1.77 @@ -27956,7 +27956,7 @@
    1.78  $SDLMAIN_DEPENDS
    1.79  __EOF__
    1.80  
    1.81 -ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl-config SDL.spec sdl.pc"
    1.82 +ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl2-config SDL2.spec sdl2.pc"
    1.83  
    1.84  cat >confcache <<\_ACEOF
    1.85  # This file is a shell script that caches the results of configure
    1.86 @@ -28874,9 +28874,9 @@
    1.87      "include/SDL_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/SDL_config.h" ;;
    1.88      "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
    1.89      "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in:Makefile.rules" ;;
    1.90 -    "sdl-config") CONFIG_FILES="$CONFIG_FILES sdl-config" ;;
    1.91 -    "SDL.spec") CONFIG_FILES="$CONFIG_FILES SDL.spec" ;;
    1.92 -    "sdl.pc") CONFIG_FILES="$CONFIG_FILES sdl.pc" ;;
    1.93 +    "sdl2-config") CONFIG_FILES="$CONFIG_FILES sdl2-config" ;;
    1.94 +    "SDL2.spec") CONFIG_FILES="$CONFIG_FILES SDL2.spec" ;;
    1.95 +    "sdl2.pc") CONFIG_FILES="$CONFIG_FILES sdl2.pc" ;;
    1.96  
    1.97    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
    1.98  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}