tenebrae/tenebrae2
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- fixed a couple of typo

Browse source 
- added --disable-sdl configure flag
This commit is contained in:
faded 2003-03-05 12:59:02 +00:00
parent a56a4b563b
commit c7ea38220d
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sdl/Makefile.am
View file

@ -7,7 +7,7 @@ endif
bin_PROGRAMS = $(SDL_PRG) tenebrae.glx bin_PROGRAMS = $(SDL_PRG) tenebrae.glx
tenebrae_glx_LDADD = @MATLIB@ @INETLIB@ @X11_LIBS@ @OPENGLLIBS@ tenebrae_glx_LDADD = @MATHLIB@ @INETLIB@ @X11_LIBS@ @OPENGLLIBS@
tenebrae_sdl_LDADD = @MATHLIB@ @INETLIB@ @SDL_LIBS@ @OPENGLLIBS@ tenebrae_sdl_LDADD = @MATHLIB@ @INETLIB@ @SDL_LIBS@ @OPENGLLIBS@

27
sdl/configure.ac
View file

@ -76,7 +76,7 @@ AC_SUBST(OPENGLLIBS)
# Check for X11 # Check for X11
# FIXME !!!! # FIXME !!!!
X11_LIBS=-L/usr/X11R6/lib -lpthread -lX11 -lXext -lXxf86dga -lXxf86vm X11_LIBS="-L/usr/X11R6/lib -lpthread -lX11 -lXext -lXxf86dga -lXxf86vm"
X11_CFLAGS="" X11_CFLAGS=""
@ -97,18 +97,23 @@ LFLAGS="-i -Cfr"
AC_SUBST(LFLAGS) AC_SUBST(LFLAGS)
# =================================================================
# Check for X11
# ================================================================= # =================================================================
# Check for SDL # Check for SDL
SDL_VERSION=1.2.0 SDL_VERSION=1.2.0
AM_PATH_SDL($SDL_VERSION,
[ have_sdl=1 ] AC_ARG_ENABLE(sdl,
[ AC_HELP_STRING([--disable-sdl], [disable sdl build [default=no]]) ],
[ sdl_enabled=no ],
[ sdl_enabled=yes ]
) )
AM_CONDITIONAL(HAVE_SDL, test x$have_sdl = x1 )
AM_PATH_SDL($SDL_VERSION,
[ have_sdl=yes ]
)
AM_CONDITIONAL(HAVE_SDL, test x$have_sdl = xyes && test x$sdl_enabled = xyes )
# ================================================================= # =================================================================
# Check for PNG # Check for PNG
@ -165,7 +170,8 @@ AC_SUBST(GAMEDIR)
AC_ARG_ENABLE(asm, AC_ARG_ENABLE(asm,
[ --enable-asm enable i686 assembly routines [default=no]], [ --enable-asm enable i686 assembly routines [default=no]],
,[enable_asm=no]) ,
[enable_asm=no])
if test x$enable_asm = xyes; then if test x$enable_asm = xyes; then
CFLAGS="$CFLAGS -DUSE_ASM" CFLAGS="$CFLAGS -DUSE_ASM"
fi fi
@ -175,7 +181,8 @@ fi
AC_ARG_ENABLE(userpref, AC_ARG_ENABLE(userpref,
[ --enable-userpref enable user preference directory [default=yes]], [ --enable-userpref enable user preference directory [default=yes]],
,[enable_userpref=yes]) ,
[enable_userpref=yes])
if test x$enable_userpref = xyes; then if test x$enable_userpref = xyes; then
CFLAGS="$CFLAGS -DUSERPREF_DIR" CFLAGS="$CFLAGS -DUSERPREF_DIR"
fi fi