Multiplayer client/server system -- Fix building MPS enabled binary

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index d87c09139f7dbb94eb8ebb6925053279a6dadfa9..18c2418198c67de808d1b1c129ed1ae63ced7005 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -10,6 +10,12 @@ else
 MPLAYER_LIBS = 
 endif
 
+if ENABLE_MSERVER_AS
+MSERVER_LIBS = $(top_builddir)/src/Server/libServer.a
+else
+MSERVER_LIBS = 
+endif
+
 if ENABLE_NETWORK_OLK
 NETWORK_LIBS = $(top_builddir)/src/NetworkOLK/libNetworkOLK.a
 else
@@ -54,7 +60,6 @@ libMain_a_SOURCES = \
        fg_init.cxx fg_init.hxx \
        fg_io.cxx fg_io.hxx \
        fg_props.cxx fg_props.hxx \
-        fgfs.cxx fgfs.hxx \
        globals.cxx globals.hxx \
         logger.cxx logger.hxx \
        options.cxx options.hxx \
@@ -93,20 +98,22 @@ fgfs_LDADD = \
        $(top_builddir)/src/Sound/libSound.a \
        $(top_builddir)/src/Airports/libAirports.a \
        $(MPLAYER_LIBS) \
+       $(MSERVER_LIBS) \
         $(NETWORK_LIBS) \
        $(top_builddir)/src/Objects/libObjects.a \
        $(top_builddir)/src/Replay/libReplay.a \
        $(top_builddir)/src/Systems/libSystems.a \
        $(top_builddir)/src/Time/libTime.a \
        $(WEATHER_LIBS) \
-       -lsgroute -lsgclouds3d -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
+       $(CLOUD3D_LIBS) \
+       -lsgroute -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
        -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \
-       -lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial $(CLOUD3D_LIBS) \
+       -lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial -lsgstructure \
        $(THREAD_LIBS) \
        -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
        $(network_LIBS) \
         $(PSL_LIBS) \
-       -lmk4 -lz \
+       -lz \
        $(opengl_LIBS) \
        $(audio_LIBS)