fly/flightgear
1
0
Fork 0
Code Activity

Add 3d cloud support back in

Browse source
This commit is contained in:
ehofman 2003-08-04 17:57:15 +00:00
parent 7ede111d12
commit 6834e86f94
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -121,6 +121,10 @@ fi
dnl Used by JSBSim to conditionally compile in fgfs interface code dnl Used by JSBSim to conditionally compile in fgfs interface code
AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode]) 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 # Check for MS Windows environment
AC_CHECK_HEADER(windows.h) AC_CHECK_HEADER(windows.h)

8
src/Main/Makefile.am
View file

@ -23,6 +23,12 @@ else
THREAD_LIBS = THREAD_LIBS =
endif endif
if FG_USE_CLOUDS_3D
CLOUD3D_LIBS = -lsgclouds3d
else
CLOUD3D_LIBS =
endif
if HAVE_PLIB_PSL if HAVE_PLIB_PSL
SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a
PSL_LIBS = -lplibpsl PSL_LIBS = -lplibpsl
@ -91,7 +97,7 @@ fgfs_LDADD = \
$(WEATHER_LIBS) \ $(WEATHER_LIBS) \
-lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \ -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
-lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \ -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \
-lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial \ -lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial $(CLOUD3D_LIBS) \
$(THREAD_LIBS) \ $(THREAD_LIBS) \
-lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \ -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
$(network_LIBS) \ $(network_LIBS) \