Mercurial > vba-linux

changeset 51:ddd34d2646f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
can now disable SDL.
author Robert McIntyre <rlm@mit.edu>
date Thu, 21 Mar 2013 21:38:40 +0000
parents 690c44762f6f
children 9f63ad276c0d
files configure.ac src/Makefile.am
diffstat 2 files changed, 18 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/configure.ac	Thu Mar 21 21:30:11 2013 +0000
     1.2 +++ b/configure.ac	Thu Mar 21 21:38:40 2013 +0000
     1.3 @@ -48,6 +48,23 @@
     1.4      [AM_CXXFLAGS="$AM_CXXFLAGS -DMMX"
     1.5       VBA_LIBS="$VBA_LIBS ../filters/lib386.a"])])
     1.6  
     1.7 +AC_ARG_ENABLE(sdl,
     1.8 +  AC_HELP_STRING([--enable-sdl],[build the SDL interface (default is yes)]),
     1.9 +  , enable_sdl=yes)
    1.10 +
    1.11 +AS_IF([test "x$enable_sdl" = xyes],
    1.12 +	    [SDL_VERSION=1.2.2
    1.13 +	     AM_PATH_SDL($SDL_VERSION, :,
    1.14 +                AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
    1.15 +	     AC_CHECK_LIB([SDL], [SDL_Init])
    1.16 +	     VBA_SRC_EXTRA="$VBA_SRC_EXTRA sdl"])
    1.17 +
    1.18 +AC_ARG_ENABLE(dev,
    1.19 +  AC_HELP_STRING([--enable-dev],[enable development features (default is yes)]),
    1.20 +  , enable_dev=yes)
    1.21 +
    1.22 +
    1.23 +
    1.24  
    1.25  
    1.26  # Checks for programs.
    1.27 @@ -66,12 +83,6 @@
    1.28  AC_CHECK_LIB(png, png_create_write_struct,
    1.29    , AC_MSG_ERROR([*** Cannot compile without libpng.]))
    1.30  
    1.31 -SDL_VERSION=1.2.2
    1.32 -AM_PATH_SDL($SDL_VERSION, :,
    1.33 -            AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
    1.34 -
    1.35 -AC_CHECK_LIB([SDL], [SDL_Init])
    1.36 -
    1.37  AC_CHECK_LIB([pthread], [pthread_create])
    1.38  
    1.39  # Checks for header files.

     2.1 --- a/src/Makefile.am	Thu Mar 21 21:30:11 2013 +0000
     2.2 +++ b/src/Makefile.am	Thu Mar 21 21:38:40 2013 +0000
     2.3 @@ -1,4 +1,4 @@
     2.4 -SUBDIRS = SFMT lua gb gba common filters @VBA_SRC_EXTRA@ sdl
     2.5 +SUBDIRS = SFMT lua gb gba common filters @VBA_SRC_EXTRA@
     2.6  
     2.7  dist_sysconf_DATA = VisualBoyAdvance.cfg
     2.8