qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-21 10:51:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added GGI target to build system.

Browse source
This commit is contained in:
Marcus Sundberg 2000-05-19 22:42:44 +00:00
parent 4163c252b3
commit 6fb394d259
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
configure.in
View file

@ -156,6 +156,36 @@ fi
dnl Checks for working -lm
AC_CHECK_LIB(m, pow,, AC_MSG_ERROR([math library (-lm) appears broken]))
dnl Checks for LibGGI support
AC_ARG_WITH(ggi,
[ --with-ggi[=DIR] use LibGGI found in DIR],
HAVE_GGI=$withval, HAVE_GGI=auto)
if test "x$HAVE_GGI" != xno; then
if test "x$HAVE_GGI" != xauto; then
GGI_CFLAGS="$GGI_CFLAGS= -I$withval/include"
GGI_LIBS="$GGI_LIBS -L$withval/lib"
dnl The default system location is /usr/include or /usr/local/include
dnl and we (obviously) do not need to set CFLAGS for that
fi
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GGI_CFLAGS"
AC_CHECK_HEADER(ggi/ggi.h, HAVE_GGI=yes, HAVE_GGI=no)
CPPFLAGS="$save_CPPFLAGS"
dnl Make sure -lggi works
if test "x$HAVE_GGI" = xyes; then
AC_CHECK_LIB(ggi, ggiEventsQueued, GGI_LIBS="$GGI_LIBS -lggi"
HAVE_GGI=yes, HAVE_GGI=no, [$GGI_LIBS]
)
fi
if test "x$HAVE_GGI" != xyes; then
GGI_CFLAGS="" GGI_LIBS=""
fi
fi
AC_SUBST(HAVE_GGI)
AC_SUBST(GGI_CFLAGS)
AC_SUBST(GGI_LIBS)
dnl Checks for SVGALib support
AC_ARG_WITH(svga,
[ --with-svga[=DIR] use SVGALib found in DIR],
@ -499,6 +529,9 @@ AC_SUBST(SV_SYS_SRC)
if test "x$HAVE_SVGA" = xyes; then
TARGETS="$TARGETS qf-client-svga"
fi
if test "x$HAVE_GGI" = xyes; then
TARGETS="$TARGETS qf-client-ggi"
fi
if test "x$HAVE_X" = xyes; then
TARGETS="$TARGETS qf-client-x11"
if test "x$HAVE_GLX" = xyes; then

1
source/Makefile.am
View file

@ -41,6 +41,7 @@ qf_client_svga_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(sv
qf_client_x11_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(x11_SOURCES)
qf_client_glx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) $(glx_SOURCES)
qf_client_ggi_LDADD= $(GGI_LIBS)
qf_client_svga_LDADD= $(SVGA_LIBS)
qf_client_x11_LDADD= $(X_PRE_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB)
qf_client_glx_LDADD= $(GLX_LIBS) $(X_PRE_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS)