fly/flightgear
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
cvsguest 2003-11-08 16:25:30 +00:00
parent ff39654f29
commit 7d02aa6560
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Main/Makefile.am
View file

@ -12,10 +12,8 @@ endif
if ENABLE_MSERVER_AS if ENABLE_MSERVER_AS
MSERVER_LIBS = $(top_builddir)/src/Server/libServer.a MSERVER_LIBS = $(top_builddir)/src/Server/libServer.a
MSERVER_BINS = fgmp
else else
MSERVER_LIBS = MSERVER_LIBS =
MSERVER_BINS =
endif endif
if ENABLE_NETWORK_OLK if ENABLE_NETWORK_OLK
@ -48,7 +46,7 @@ AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
bin_PROGRAMS = fgfs $(MSERVER_BINS) bin_PROGRAMS = fgfs
noinst_SCRIPTS = runfgfs.bat runfgfs noinst_SCRIPTS = runfgfs.bat runfgfs
@ -100,6 +98,7 @@ fgfs_LDADD = \
$(top_builddir)/src/Sound/libSound.a \ $(top_builddir)/src/Sound/libSound.a \
$(top_builddir)/src/Airports/libAirports.a \ $(top_builddir)/src/Airports/libAirports.a \
$(MPLAYER_LIBS) \ $(MPLAYER_LIBS) \
$(MSERVER_LIBS) \
$(NETWORK_LIBS) \ $(NETWORK_LIBS) \
$(top_builddir)/src/Objects/libObjects.a \ $(top_builddir)/src/Objects/libObjects.a \
$(top_builddir)/src/Replay/libReplay.a \ $(top_builddir)/src/Replay/libReplay.a \
@ -118,12 +117,4 @@ fgfs_LDADD = \
$(opengl_LIBS) \ $(opengl_LIBS) \
$(audio_LIBS) $(audio_LIBS)
if ENABLE_MSERVER_AS
fgmp_SOURCES = bootstrap.cxx
fgmp_LDADD = $(fgfs_LDADD) $(MSERVER_LIBS)
endif
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src