# HG changeset patch # User Robert McIntyre # Date 1363901920 0 # Node ID ddd34d2646f919c837c21fcf5566c87046cdb7ef # Parent 690c44762f6f924e571093ba8d30c2cbf397a924 can now disable SDL. diff -r 690c44762f6f -r ddd34d2646f9 configure.ac --- a/configure.ac Thu Mar 21 21:30:11 2013 +0000 +++ b/configure.ac Thu Mar 21 21:38:40 2013 +0000 @@ -48,6 +48,23 @@ [AM_CXXFLAGS="$AM_CXXFLAGS -DMMX" VBA_LIBS="$VBA_LIBS ../filters/lib386.a"])]) +AC_ARG_ENABLE(sdl, + AC_HELP_STRING([--enable-sdl],[build the SDL interface (default is yes)]), + , enable_sdl=yes) + +AS_IF([test "x$enable_sdl" = xyes], + [SDL_VERSION=1.2.2 + AM_PATH_SDL($SDL_VERSION, :, + AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])) + AC_CHECK_LIB([SDL], [SDL_Init]) + VBA_SRC_EXTRA="$VBA_SRC_EXTRA sdl"]) + +AC_ARG_ENABLE(dev, + AC_HELP_STRING([--enable-dev],[enable development features (default is yes)]), + , enable_dev=yes) + + + # Checks for programs. @@ -66,12 +83,6 @@ AC_CHECK_LIB(png, png_create_write_struct, , AC_MSG_ERROR([*** Cannot compile without libpng.])) -SDL_VERSION=1.2.2 -AM_PATH_SDL($SDL_VERSION, :, - AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])) - -AC_CHECK_LIB([SDL], [SDL_Init]) - AC_CHECK_LIB([pthread], [pthread_create]) # Checks for header files. diff -r 690c44762f6f -r ddd34d2646f9 src/Makefile.am --- a/src/Makefile.am Thu Mar 21 21:30:11 2013 +0000 +++ b/src/Makefile.am Thu Mar 21 21:38:40 2013 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = SFMT lua gb gba common filters @VBA_SRC_EXTRA@ sdl +SUBDIRS = SFMT lua gb gba common filters @VBA_SRC_EXTRA@ dist_sysconf_DATA = VisualBoyAdvance.cfg