From 1fba073faa8ddcd1087c80eb5e84d0a18ac3f92b Mon Sep 17 00:00:00 2001
From: James Goppert <jgoppert@w7.hsl.dynalias.com>
Date: Tue, 16 Aug 2011 22:13:16 -0400
Subject: [PATCH] Worked on conditional gui build.
---
.gitignore | 1 +
configure.in | 18 +++++++++++++++---
gui/Makefile.am | 26 +++++++++++++++++++++-----
3 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index b9be357..b8a62f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
# exclude patterns (uncomment them if you want to use them):
# Our Programs
+prep_plot
*.app
*.test
*.elf
diff --git a/configure.in b/configure.in
index a6525da..f8aa743 100644
--- a/configure.in
+++ b/configure.in
@@ -41,6 +41,21 @@ AC_ARG_ENABLE([libraries],
[build_libraries=no])
AM_CONDITIONAL(BUILD_LIBRARIES, test "x$build_libraries" = xyes)
+# AutoTroll with Qt
+AC_ARG_ENABLE([gui],
+ [AS_HELP_STRING([--enable-gui],
+ [build JSBSim gui [default=no]])],
+ [build_gui=$enableval],
+ [build_gui=no])
+AM_CONDITIONAL(BUILD_GUI, test "x$build_gui" = xyes)
+AS_IF([test "x$build_gui" = "xyes"], [
+ PKG_CHECK_MODULES([OSG],[openscenegraph])
+])
+AS_IF([test "x$build_gui" = "xyes"], [
+ AT_WITH_QT([gui opengl])
+])
+
+
dnl Checks for programs.
AC_DISABLE_SHARED
AC_PROG_CPP
@@ -106,9 +121,6 @@ AC_DEFINE(socklen_t,size_t)], [
AC_MSG_RESULT(int)
AC_DEFINE(socklen_t,int)])])
-# AutoTroll with Qt
-AT_WITH_QT([gui opengl])
-
AC_OUTPUT(
jsbsim.pc
Makefile
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 17a6511..2a7fb7a 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_GUI
+
include $(top_srcdir)/autotroll.mk
# initiliaze to null
@@ -5,12 +7,26 @@ bin_PROGRAMS =
BUILT_SOURCES =
bin_PROGRAMS += trim
-trim_SOURCES = main.cpp MainWindow.cpp MainWindow.hpp MainWindow.ui MainWindow.ui.h \
+trim_SOURCES = main.cpp MainWindow.cpp MainWindow.hpp MainWindow.moc.cpp MainWindow.ui.h \
osgUtils.cpp osgUtils.hpp Viewer.cpp Viewer.hpp QOSGAdapterWidget.cpp \
- QOSGAdapterWidget.hpp \
- $(top_srcdir)/src/math/FGNelderMead.cpp
+ QOSGAdapterWidget.hpp $(top_srcdir)/src/math/FGNelderMead.cpp \
+ ${top_srcdir}/src/FGFDMExec.cpp ${top_srcdir}/src/FGJSBBase.cpp \
+ ${top_srcdir}/src/FGFDMExec.h ${top_srcdir}/src/FGJSBBase.h
trim_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS)
-trim_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -DUSE_QT4 -DDATADIR=\"$(top_srcdir)/data\" -I$(top_srcdir)/src
+trim_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) $(OSG_CFLAGS) -DUSE_QT4 -DDATADIR=\"$(top_srcdir)/data\" -I$(top_srcdir)/src
trim_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS)
-trim_LDADD = $(QT_LIBS) $(LDADD)
+trim_LDADD = $(QT_LIBS) $(LDADD) $(OSG_LIBS) -lboost_thread-mt -lboost_system-mt -lm \
+ $(top_srcdir)/src/initialization/libInit.a \
+ $(top_srcdir)/src/models/atmosphere/libAtmosphere.a \
+ $(top_srcdir)/src/models/libModels.a \
+ $(top_srcdir)/src/models/flight_control/libFlightControl.a \
+ $(top_srcdir)/src/models/propulsion/libPropulsion.a \
+ $(top_srcdir)/src/input_output/libInputOutput.a \
+ $(top_srcdir)/src/math/libMath.a \
+ $(top_srcdir)/src/simgear/props/libProperties.a \
+ $(top_srcdir)/src/simgear/xml/libExpat.a \
+ $(top_srcdir)/src/simgear/magvar/libcoremag.a
+
BUILT_SOURCES += MainWindow.moc.cpp MainWindow.ui.h
+
+endif
--
GitLab