fly/flightgear
1
0
Fork 0
Code Activity

make --enable-osgviewer the default

Browse source 
From Till Busch
This commit is contained in:
timoore 2008-04-25 21:29:03 +00:00
parent a04d4cbed6
commit de277df8b8
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
configure.ac
View file

@ -98,7 +98,7 @@ if test "x$with_logging" = "xno" ; then
AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output]) AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output])
fi fi
AC_ARG_ENABLE(sp_fdms, [ --enable-sp-fdms Include special purpose Flight Models], [enable_sp_fdms="$enableval"] ) AC_ARG_ENABLE(sp_fdms, [ --enable-sp-fdms Include special purpose Flight Models], [enable_sp_fdms="$enableval"] )
if test "x$enable_sp_fdms" != "xno"; then if test "x$enable_sp_fdms" != "xno"; then
AC_DEFINE([ENABLE_SP_FDM], 1, [Define to include special purpose FDMs]) AC_DEFINE([ENABLE_SP_FDM], 1, [Define to include special purpose FDMs])
else else
@ -197,23 +197,28 @@ AC_SEARCH_LIBS(dlclose, dl)
base_LIBS="$LIBS" base_LIBS="$LIBS"
dnl Check for SDL if enabled. dnl Check for SDL or glut if enabled.
AC_ARG_ENABLE(sdl, [ --enable-sdl Configure to use SDL instead of GLUT], [enable_sdl="$enableval"]) AC_ARG_ENABLE(osgviewer, [ --enable-osgviewer Configure to use osgViewer(default)], [enable_osgviewer="$enableval"])
AC_ARG_ENABLE(osgviewer, [ --enable-osgviewer Configure to use osgViewer], [enable_osgviewer="$enableval"]) AC_ARG_ENABLE(sdl, [ --enable-sdl Configure to use SDL], [enable_sdl="$enableval"])
AC_ARG_ENABLE(glut, [ --enable-glut Configure to use GLUT], [enable_glut="$enableval"])
AM_CONDITIONAL(USE_SDL, test "x$enable_sdl" = "xyes") AM_CONDITIONAL(USE_SDL, test "x$enable_sdl" = "xyes")
AM_CONDITIONAL(USE_OSGVIEWER, test "x$enable_osgviewer" = "xyes") AM_CONDITIONAL(USE_GLUT, test "x$enable_glut" = "xyes")
if test "x$enable_sdl" = "xyes"; then if test "x$enable_sdl" != "xyes" -a "x$enable_glut" != "xyes" -a "x$enable_osgviewer" != "xno"; then
AC_DEFINE([PU_USE_SDL], 1, [Define to use SDL]) enable_osgviewer="yes"
fi
if test "x$enable_osgviewer" = "xyes"; then
AC_DEFINE([USE_OSGVIEWER], 1, [Define to use osgViewer in renderer])
AC_DEFINE([ENABLE_OSGVIEWER], 1, [Define to use osgViewer in renderer])
AC_DEFINE([PU_USE_NATIVE], 1, [Define to use native system])
elif test "x$enable_sdl" = "xyes"; then
AC_DEFINE([PU_USE_SDL], 1, [Define to use SDL])
elif test "x$enable_glut" = "xyes"; then
AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut])
else else
if test "x$enable_osgviewer" = "xyes"; then AC_MSG_ERROR([One (and only one) of --enable-osgviewer, --enable-sdl, or --enable-glut must be supplied])
AC_DEFINE([ENABLE_OSGVIEWER], 1, [Define to use osgViewer in renderer])
AC_DEFINE([PU_USE_NATIVE], 1, [Define to use native system])
else
AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut])
fi
fi fi
AC_ARG_ENABLE(osgdebug, [ --enable-osgdebug Use OSG debug libraries], [enable_osgdebug="$enableval"]) AC_ARG_ENABLE(osgdebug, [ --enable-osgdebug Use OSG debug libraries], [enable_osgdebug="$enableval"])
dnl check for OpenGL related libraries dnl check for OpenGL related libraries
case "${host}" in case "${host}" in

6
src/Main/Makefile.am
View file

@ -19,10 +19,10 @@ GFX_COMMON = fg_os_common.cxx fg_os.hxx
if USE_SDL if USE_SDL
GFX_CODE = fg_os_sdl.cxx $(GFX_COMMON) GFX_CODE = fg_os_sdl.cxx $(GFX_COMMON)
else else
if USE_OSGVIEWER if USE_GLUT
GFX_CODE = fg_os_osgviewer.cxx $(GFX_COMMON)
else
GFX_CODE = fg_os.cxx $(GFX_COMMON) GFX_CODE = fg_os.cxx $(GFX_COMMON)
else
GFX_CODE = fg_os_osgviewer.cxx $(GFX_COMMON)
endif endif
endif endif