-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
This patch supports the option to link against OSG debugging libraries.
It also includes the change that Hans Fugal just posted.
Tim
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iD8DBQFGm+pWeDhWHdXrDRURAteOAKCeM7m+09zffFVAXx2APHXudSuaoQCfar4P
2TVme2T/q++ETk1sHHQ8FBc=
=oFyS
-----END PGP SIGNATURE-----
diff --git a/configure.ac b/configure.ac
index 9a2b50e..0ae3d55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,9 @@ else
fi
fi
+AC_ARG_ENABLE(osgdebug, [ --enable-osgdebug Use OSG debug libraries], [enable_osgdebug="$enableval"])
+AM_CONDITIONAL(USE_OSGDEBUG, test "x$enable_osgdebug" = "xyes")
+
dnl check for OpenGL related libraries
case "${host}" in
*-*-cygwin* | *-*-mingw32*)
diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index e9c8e6b..f19702c 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -25,6 +25,12 @@ GFX_CODE = fg_os.cxx fg_os.hxx
endif
endif
+if USE_OSGDEBUG
+OSG_LIBS = -losgViewerd -losgGAd -losgTextd -losgFXd -losgUtild -losgDBd -losgSimd -losgd -lOpenThreadsd
+else
+OSG_LIBS = -losgViewer -losgGA -losgText -losgFX -losgUtil -losgDB -losgSim -losg -lOpenThreads
+endif
+
JSBSIM_LIBS = \
$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
$(top_builddir)/src/FDM/JSBSim/initialization/libInit.a \
@@ -104,7 +110,7 @@ fgfs_LDADD = \
-lsgstructure -lsgenvironment \
-lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet \
-lplibsg -lplibul \
- -losgViewer -losgFX -losgUtil -losgDB -losgSim -losg -lOpenThreads \
+ $(OSG_LIBS) \
$(THREAD_LIBS) \
$(network_LIBS) \
-lz \
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Flightgear-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
