X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FMakefile.am;h=bf8c092ad1861d2e076eece0e8af0c6ca6496bbf;hb=1c3e2d4942fe74dac43f1f6af542f9de7d4825db;hp=87fc984aad7b54586471978436513f18263fa510;hpb=cbdeb3be16e668ed62bbe63579caf431f58a17fa;p=flightgear.git diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am index 87fc984aa..bf8c092ad 100644 --- a/src/Main/Makefile.am +++ b/src/Main/Makefile.am @@ -7,6 +7,12 @@ else MPLAYER_LIBS = endif +if ENABLE_SP_FDM +SP_FDM_LIBS = $(top_builddir)/src/FDM/SP/libSPFDM.a +else +SP_FDM_LIBS = +endif + if WITH_THREADS THREAD_LIBS = -lsgthreads $(thread_LIBS) else @@ -19,12 +25,6 @@ else GFX_CODE = fg_os.cxx fg_os.hxx endif -if FG_USE_CLOUDS_3D -CLOUD3D_LIBS = -lsgclouds3d -else -CLOUD3D_LIBS = -endif - AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\" bin_PROGRAMS = fgfs metar @@ -69,6 +69,7 @@ fgfs_LDADD = \ $(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \ $(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \ $(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \ + $(SP_FDM_LIBS) \ $(top_builddir)/src/GUI/libGUI.a \ $(top_builddir)/src/Autopilot/libAutopilot.a \ $(top_builddir)/src/Input/libInput.a \ @@ -87,7 +88,6 @@ fgfs_LDADD = \ $(top_builddir)/src/Time/libTime.a \ $(top_builddir)/src/Traffic/libTraffic.a \ $(top_builddir)/src/Environment/libEnvironment.a \ - $(CLOUD3D_LIBS) \ -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \ -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \ -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \