Changeset 731 for abuse/trunk/configure.acTweet

Timestamp:

Jul 21, 2014, 12:50:29 AM (8 years ago)

Author:

jjsimpso

Message:

sdlport: Add support for SDL2, inculding the game controller API. Configure
script will check for SDL2 and use it if present, otherwise it will fall
back to SDL v1. Some old SDL v1 features not implemented yet on SDL2, such
as saving screenshots.

core: Small change for SDL2 game controller API to disable the game
controller in the save/load game menu.

Summary of game controller API changes:

• Enable with -gamepad
• Tested with PS3 dualshock 3.
• D-pad moves, right analog controls aiming
• X: change weapon, []: jump, R1: fire, L1: special ability, /\:use/activate
• All menu navigation requires the mouse, which is disabled during normal game play.

File:

• abuse/trunk/configure.ac (modified) (4 diffs)

abuse/trunk/configure.ac

@@ -51 +51 @@
 
 dnl Check for SDL
-SDL_VERSION=1.1.6
-AM_PATH_SDL($SDL_VERSION, :,
-    AC_MSG_ERROR([*** SDL version $SDL_VERSION or above not found!]))
+SDL2_VERSION=2.0.0
+SDL2_FOUND="no"
+SDLPORT_DIR=sdl2port
+AM_PATH_SDL2($SDL2_VERSION, SDL2_FOUND="yes",
+    AC_MSG_ERROR([*** SDL2 version $SDL2_VERSION or above not found!]))
+
+if test $SDL2_FOUND = "no"; then
+  SDL_VERSION=1.1.6
+  SDLPORT_DIR=sdlport
+  AM_PATH_SDL($SDL_VERSION, :,
+      AC_MSG_ERROR([*** SDL version $SDL_VERSION or above not found!]))
+fi
+
 CFLAGS="$CFLAGS $SDL_CFLAGS"
 LIBS="$LIBS $SDL_LIBS $X_LIBS"
+AC_SUBST(SDLPORT_DIR)
 
 dnl Check for SDL mixer
-ac_cv_my_have_sdl_mixer="no"
-save_CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}"
-AC_CHECK_HEADERS(SDL/SDL_mixer.h, [ac_cv_my_have_sdl_mixer="yes"])
-CPPFLAGS="${save_CPPFLAGS}"
-if test "${ac_cv_my_have_sdl_mixer}" = "no"; then
-  AC_MSG_ERROR([*** SDL_mixer not found!])
-fi
-LIBS="$LIBS -lSDL_mixer"
+if test $SDL2_FOUND = "yes"; then
+  ac_cv_my_have_sdl_mixer="no"
+  save_CPPFLAGS="${CPPFLAGS}"
+  CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}"
+  AC_CHECK_HEADERS(SDL2/SDL_mixer.h, [ac_cv_my_have_sdl_mixer="yes"])
+  CPPFLAGS="${save_CPPFLAGS}"
+  if test "${ac_cv_my_have_sdl_mixer}" = "no"; then
+    AC_MSG_ERROR([*** SDL_mixer not found!])
+  fi
+  LIBS="$LIBS -lSDL2_mixer"
+else
+  ac_cv_my_have_sdl_mixer="no"
+  save_CPPFLAGS="${CPPFLAGS}"
+  CPPFLAGS="${CPPFLAGS} ${SDL_CFLAGS}"
+  AC_CHECK_HEADERS(SDL/SDL_mixer.h, [ac_cv_my_have_sdl_mixer="yes"])
+  CPPFLAGS="${save_CPPFLAGS}"
+  if test "${ac_cv_my_have_sdl_mixer}" = "no"; then
+    AC_MSG_ERROR([*** SDL_mixer not found!])
+  fi
+  LIBS="$LIBS -lSDL_mixer"
+fi
 
 if test "${enable_debug}" = "yes"; then
@@ -150 +173 @@
     src/net/Makefile
     src/imlib/Makefile
-    src/sdlport/Makefile
     data/Makefile
     doc/Makefile
@@ -156 +178 @@
     doc/abuse-tool.6])
 
+if test $SDL2_FOUND = "yes"; then
+  AC_OUTPUT([src/sdl2port/Makefile])
+else
+  AC_OUTPUT([src/sdlport/Makefile])
+fi
+
+if test $SDL2_FOUND = "yes"; then
+echo "
+------ Configuration for $PACKAGE $VERSION ------
+    Compiler:          ${CC} (`${CC} --version | head -n 1`)
+    Install prefix:    ${prefix}
+    Asset directory:   ${with_assetdir}
+    SDL version:       `sdl2-config --version`
+
+Now type 'make' to build $PACKAGE.
+"
+else
 echo "
 ------ Configuration for $PACKAGE $VERSION ------
@@ -166 +205 @@
 Now type 'make' to build $PACKAGE.
 "
+fi