Move the texture loader to SimGear

[flightgear.git] / src / Main / Makefile.am

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 1752e521dafc81ed32eeeea3746024af1b16845f..8c58124db427a47e61ee227d07655d6ef6b91b1b 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -4,21 +4,33 @@ else
 WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
 endif
 
+if ENABLE_MPLAYER_AS
+MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
+else
+MPLAYER_LIBS = 
+endif
+
 if ENABLE_NETWORK_OLK
-NETWORK_LIBS = \
-       $(top_builddir)/src/Network/libNetwork.a \
-       $(top_builddir)/src/NetworkOLK/libNetworkOLK.a
+NETWORK_LIBS = $(top_builddir)/src/NetworkOLK/libNetworkOLK.a
 else
-NETWORK_LIBS = \
-       $(top_builddir)/src/Network/libNetwork.a
+NETWORK_LIBS =
 endif
 
+
 if WITH_THREADS
 THREAD_LIBS = -lsgthreads
 else
 THREAD_LIBS =
 endif
 
+if HAVE_PLIB_PSL
+SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a
+PSL_LIBS = -lplibpsl
+else
+SCRIPTING_LIBS =
+PSL_LIBS =
+endif
+
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
 
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
@@ -40,6 +52,7 @@ fgfs_SOURCES = \
         logger.cxx logger.hxx \
        options.cxx options.hxx \
        splash.cxx splash.hxx \
+       util.cxx util.hxx \
        viewer.cxx viewer.hxx \
        viewmgr.cxx viewmgr.hxx \
         location.cxx location.hxx
@@ -53,27 +66,35 @@ fgfs_LDADD = \
        $(top_builddir)/src/Controls/libControls.a \
        $(top_builddir)/src/FDM/libFlight.a \
        $(top_builddir)/src/FDM/Balloon/libBalloon.a \
+       $(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
+       $(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.a \
        $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
        $(top_builddir)/src/FDM/YASim/libYASim.a \
        $(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
        $(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
        $(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
        $(top_builddir)/src/GUI/libGUI.a \
+       $(top_builddir)/src/Input/libInput.a \
+       $(top_builddir)/src/Instrumentation/libInstrumentation.a \
        $(top_builddir)/src/Model/libModel.a \
+       $(top_builddir)/src/Network/libNetwork.a \
        $(top_builddir)/src/Navaids/libNavaids.a \
        $(top_builddir)/src/Scenery/libScenery.a \
+        $(SCRIPTING_LIBS) \
        $(top_builddir)/src/Sound/libSound.a \
        $(top_builddir)/src/Airports/libAirports.a \
+       $(MPLAYER_LIBS) \
         $(NETWORK_LIBS) \
        $(top_builddir)/src/Objects/libObjects.a \
+       $(top_builddir)/src/Systems/libSystems.a \
        $(top_builddir)/src/Time/libTime.a \
        $(WEATHER_LIBS) \
-       $(top_builddir)/src/Input/libInput.a \
-       -lsgroute -lsgsky -lsgclouds3d -lsgephem -lsgtiming -lsgio -lsgscreen \
+       -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
        -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
        -lsgserial \
        $(THREAD_LIBS) \
-       -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg -lplibul \
+       -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
+        $(PSL_LIBS) \
        -lmk4 -lz \
        $(opengl_LIBS) \
        $(audio_LIBS)