From 984e98f17c0e301e82daa931826bf4f308675e1e Mon Sep 17 00:00:00 2001 From: till busch Date: Tue, 1 Apr 2008 16:52:42 +0200 Subject: [PATCH] make osgviewer the default choice in configure --- configure.ac | 17 +++++++++-------- src/Main/Makefile.am | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 85a50bd..14514d8 100644 --- a/configure.ac +++ b/configure.ac @@ -98,7 +98,7 @@ if test "x$with_logging" = "xno" ; then AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output]) 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 AC_DEFINE([ENABLE_SP_FDM], 1, [Define to include special purpose FDMs]) else @@ -198,22 +198,23 @@ AC_SEARCH_LIBS(dlclose, dl) base_LIBS="$LIBS" dnl Check for SDL 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], [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_OSGVIEWER, test "x$enable_osgviewer" = "xyes") +AM_CONDITIONAL(USE_GLUT, test "x$enable_glut" = "xyes") if test "x$enable_sdl" = "xyes"; then AC_DEFINE([PU_USE_SDL], 1, [Define to use SDL]) else - if test "x$enable_osgviewer" = "xyes"; then + if test "x$enable_glut" = "xyes"; then + AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut]) + else + 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]) - else - AC_DEFINE([PU_USE_GLUT], 1, [Define to use glut]) 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 case "${host}" in diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am index 15c4f6d..3991083 100644 --- a/src/Main/Makefile.am +++ b/src/Main/Makefile.am @@ -19,10 +19,10 @@ GFX_COMMON = fg_os_common.cxx fg_os.hxx if USE_SDL GFX_CODE = fg_os_sdl.cxx $(GFX_COMMON) else -if USE_OSGVIEWER -GFX_CODE = fg_os_osgviewer.cxx $(GFX_COMMON) -else +if USE_GLUT GFX_CODE = fg_os.cxx $(GFX_COMMON) +else +GFX_CODE = fg_os_osgviewer.cxx $(GFX_COMMON) endif endif -- 1.5.2.5