X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FMakefile.am;h=0af345baddde3233b8e5ce1401f3a67947ec5ae2;hb=18d1593c42c2df60d7fb44ace722ca3e8a7fd82c;hp=774999354916014809bbb1c760a2d9e38ea3fd46;hpb=994f4a16c4997b261bdcd3ccfa3945ca02c79ea5;p=flightgear.git

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 774999354..0af345bad 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,7 +1,12 @@
-if ENABLE_MPLAYER_AS
+EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in \
+             fg_os_osgviewer.cxx fg_os.hxx
+
 MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
+
+if ENABLE_SP_FDM
+SP_FDM_LIBS = $(top_builddir)/src/FDM/SP/libSPFDM.a
 else
-MPLAYER_LIBS = 
+SP_FDM_LIBS = 
 endif
 
 if WITH_THREADS
@@ -10,21 +15,19 @@ else
 THREAD_LIBS =
 endif
 
-if USE_SDL
-GFX_CODE = fg_os_sdl.cxx fg_os.hxx
-else
-GFX_CODE = fg_os.cxx fg_os.hxx
-endif
+GFX_CODE = fg_os_osgviewer.cxx fg_os_common.cxx fg_os.hxx
 
-if FG_USE_CLOUDS_3D
-CLOUD3D_LIBS = -lsgclouds3d
-else
-CLOUD3D_LIBS = 
-endif
-
-AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
+JSBSIM_LIBS = \
+	$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
+        $(top_builddir)/src/FDM/JSBSim/initialization/libInit.a \
+        $(top_builddir)/src/FDM/JSBSim/models/libModels.a \
+        $(top_builddir)/src/FDM/JSBSim/models/flight_control/libFlightControl.a\
+        $(top_builddir)/src/FDM/JSBSim/models/atmosphere/libAtmosphere.a \
+        $(top_builddir)/src/FDM/JSBSim/models/propulsion/libPropulsion.a \
+        $(top_builddir)/src/FDM/JSBSim/input_output/libInputOutput.a \
+        $(top_builddir)/src/FDM/JSBSim/math/libMath.a
 
-EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
+AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\"
 
 bin_PROGRAMS = fgfs metar
 
@@ -36,6 +39,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,6 +51,11 @@ libMain_a_SOURCES = \
 	util.cxx util.hxx \
 	viewer.cxx viewer.hxx \
 	viewmgr.cxx viewmgr.hxx \
+	CameraGroup.cxx CameraGroup.hxx \
+	FGEventHandler.cxx FGEventHandler.hxx \
+	ViewPartitionNode.cxx ViewPartitionNode.hxx \
+	WindowSystemAdapter.hxx WindowSystemAdapter.cxx \
+	WindowBuilder.hxx WindowBuilder.cxx \
 	$(GFX_CODE)
 
 fgfs_SOURCES = bootstrap.cxx
@@ -54,25 +63,24 @@ fgfs_SOURCES = bootstrap.cxx
 fgfs_LDADD = \
 	$(top_builddir)/src/Main/libMain.a \
 	$(top_builddir)/src/Aircraft/libAircraft.a \
-	$(top_builddir)/src/ATC/libATC.a \
+	$(top_builddir)/src/ATCDCL/libATCDCL.a \
 	$(top_builddir)/src/Cockpit/libCockpit.a \
 	$(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
-	$(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 \
+	$(JSBSIM_LIBS) \
 	$(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 \
+	$(SP_FDM_LIBS) \
 	$(top_builddir)/src/GUI/libGUI.a \
 	$(top_builddir)/src/Autopilot/libAutopilot.a \
 	$(top_builddir)/src/Input/libInput.a \
+	$(top_builddir)/src/Instrumentation/KLN89/libKLN89.a \
 	$(top_builddir)/src/Instrumentation/libInstrumentation.a \
+	$(top_builddir)/src/Instrumentation/HUD/libHUD.a \
 	$(top_builddir)/src/Model/libModel.a \
-	$(top_builddir)/src/AIModel/libAIModel.a \
 	$(top_builddir)/src/Network/libNetwork.a \
 	$(top_builddir)/src/Navaids/libNavaids.a \
 	$(top_builddir)/src/Scenery/libScenery.a \
@@ -80,21 +88,24 @@ fgfs_LDADD = \
 	$(top_builddir)/src/Sound/libSound.a \
 	$(top_builddir)/src/Airports/libAirports.a \
 	$(MPLAYER_LIBS) \
-	$(top_builddir)/src/Replay/libReplay.a \
+        $(top_builddir)/src/AIModel/libAIModel.a \
+	$(top_builddir)/src/ATC/libATC.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 \
+	-lsgutil -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops \
+	-lsgdebug -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound -lsgserial \
 	-lsgstructure -lsgenvironment \
+	-lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet \
+	-lplibsg -lplibul \
+	$(OSG_LIBS) \
 	$(THREAD_LIBS) \
-	-lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
 	$(network_LIBS) \
 	-lz \
 	$(opengl_LIBS) \
-	$(audio_LIBS)
+	$(openal_LIBS)
 
 metar_SOURCES = metar_main.cxx
 
@@ -103,4 +114,4 @@ metar_LDADD = \
         -lplibnet -lplibul $(network_LIBS) \
         -lz $(base_LIBS)
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim