X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FMakefile.am;h=bf8c092ad1861d2e076eece0e8af0c6ca6496bbf;hb=1c3e2d4942fe74dac43f1f6af542f9de7d4825db;hp=db58cab4a72c7569ac58fdf34e12be07f0ba5b33;hpb=b0a3ce0fc0fe56f15646974b87366450021069bb;p=flightgear.git

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index db58cab4a..bf8c092ad 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,9 +1,18 @@
+EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in \
+             fg_os_sdl.cxx fg_os.cxx fg_os.hxx
+
 if ENABLE_MPLAYER_AS
 MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
 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
@@ -11,20 +20,12 @@ THREAD_LIBS =
 endif
 
 if USE_SDL
-GFX_SOURCES = fg_os_sdl.cxx fg_os.hxx
+GFX_CODE = fg_os_sdl.cxx fg_os.hxx
 else
-GFX_SOURCES = fg_os.cxx fg_os.hxx
+GFX_CODE = fg_os.cxx fg_os.hxx
 endif
 
-if FG_USE_CLOUDS_3D
-CLOUD3D_LIBS = -lsgclouds3d
-else
-CLOUD3D_LIBS = 
-endif
-
-AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
-
-EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
+AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\"
 
 bin_PROGRAMS = fgfs metar
 
@@ -36,6 +37,7 @@ noinst_LIBRARIES = libMain.a
 
 libMain_a_SOURCES = \
 	main.cxx main.hxx \
+	renderer.cxx renderer.hxx \
 	fg_commands.cxx fg_commands.hxx \
 	fg_init.cxx fg_init.hxx \
 	fg_io.cxx fg_io.hxx \
@@ -47,7 +49,7 @@ libMain_a_SOURCES = \
 	util.cxx util.hxx \
 	viewer.cxx viewer.hxx \
 	viewmgr.cxx viewmgr.hxx \
-	$(GFX_SOURCES)
+	$(GFX_CODE)
 
 fgfs_SOURCES = bootstrap.cxx
 
@@ -67,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 \
@@ -83,8 +86,8 @@ fgfs_LDADD = \
 	$(top_builddir)/src/Replay/libReplay.a \
 	$(top_builddir)/src/Systems/libSystems.a \
 	$(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 \
@@ -94,7 +97,7 @@ fgfs_LDADD = \
 	$(network_LIBS) \
 	-lz \
 	$(opengl_LIBS) \
-	$(audio_LIBS)
+	$(openal_LIBS)
 
 metar_SOURCES = metar_main.cxx