From 6834e86f94f0bf09f939ff41b583319937d965a4 Mon Sep 17 00:00:00 2001 From: ehofman Date: Mon, 4 Aug 2003 17:57:15 +0000 Subject: [PATCH] Add 3d cloud support back in --- configure.ac | 4 ++++ src/Main/Makefile.am | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a98c8fbe8..39f861fe3 100644 --- a/configure.ac +++ b/configure.ac @@ -121,6 +121,10 @@ fi dnl Used by JSBSim to conditionally compile in fgfs interface code AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode]) +dnl Used to controll whether clouds3d should be compiled in or not +AC_DEFINE([FG_USE_CLOUDS_3D], 1, [Define to use 3D cloud support]) +AM_CONDITIONAL(FG_USE_CLOUDS_3D, test "x$FG_USE_CLOUDS_3D" != "x") + # Check for MS Windows environment AC_CHECK_HEADER(windows.h) diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am index 7c737b018..9981ded31 100644 --- a/src/Main/Makefile.am +++ b/src/Main/Makefile.am @@ -23,6 +23,12 @@ else THREAD_LIBS = endif +if FG_USE_CLOUDS_3D +CLOUD3D_LIBS = -lsgclouds3d +else +CLOUD3D_LIBS = +endif + if HAVE_PLIB_PSL SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a PSL_LIBS = -lplibpsl @@ -91,7 +97,7 @@ fgfs_LDADD = \ $(WEATHER_LIBS) \ -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \ -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \ - -lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial \ + -lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial $(CLOUD3D_LIBS) \ $(THREAD_LIBS) \ -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \ $(network_LIBS) \