Skip to content
Snippets Groups Projects
Commit 1fba073f authored by James Goppert's avatar James Goppert
Browse files

Worked on conditional gui build.

parent b23f1151
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# exclude patterns (uncomment them if you want to use them): # exclude patterns (uncomment them if you want to use them):
# Our Programs # Our Programs
prep_plot
*.app *.app
*.test *.test
*.elf *.elf
......
...@@ -41,6 +41,21 @@ AC_ARG_ENABLE([libraries], ...@@ -41,6 +41,21 @@ AC_ARG_ENABLE([libraries],
[build_libraries=no]) [build_libraries=no])
AM_CONDITIONAL(BUILD_LIBRARIES, test "x$build_libraries" = xyes) 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. dnl Checks for programs.
AC_DISABLE_SHARED AC_DISABLE_SHARED
AC_PROG_CPP AC_PROG_CPP
...@@ -106,9 +121,6 @@ AC_DEFINE(socklen_t,size_t)], [ ...@@ -106,9 +121,6 @@ AC_DEFINE(socklen_t,size_t)], [
AC_MSG_RESULT(int) AC_MSG_RESULT(int)
AC_DEFINE(socklen_t,int)])]) AC_DEFINE(socklen_t,int)])])
# AutoTroll with Qt
AT_WITH_QT([gui opengl])
AC_OUTPUT( AC_OUTPUT(
jsbsim.pc jsbsim.pc
Makefile Makefile
......
if BUILD_GUI
include $(top_srcdir)/autotroll.mk include $(top_srcdir)/autotroll.mk
# initiliaze to null # initiliaze to null
...@@ -5,12 +7,26 @@ bin_PROGRAMS = ...@@ -5,12 +7,26 @@ bin_PROGRAMS =
BUILT_SOURCES = BUILT_SOURCES =
bin_PROGRAMS += trim 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 \ osgUtils.cpp osgUtils.hpp Viewer.cpp Viewer.hpp QOSGAdapterWidget.cpp \
QOSGAdapterWidget.hpp \ QOSGAdapterWidget.hpp $(top_srcdir)/src/math/FGNelderMead.cpp \
$(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_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_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 BUILT_SOURCES += MainWindow.moc.cpp MainWindow.ui.h
endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment