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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index f19702c2e..0af345bad 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in \
-             fg_os_sdl.cxx fg_os.cxx fg_os_osgviewer.cxx fg_os.hxx
+             fg_os_osgviewer.cxx fg_os.hxx
 
 MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
 
@@ -15,21 +15,7 @@ else
 THREAD_LIBS =
 endif
 
-if USE_SDL
-GFX_CODE = fg_os_sdl.cxx fg_os.hxx
-else
-if USE_OSGVIEWER
-GFX_CODE = fg_os_osgviewer.cxx fg_os.hxx
-else
-GFX_CODE = fg_os.cxx fg_os.hxx
-endif
-endif
-
-if USE_OSGDEBUG
-OSG_LIBS = -losgViewerd -losgGAd -losgTextd -losgFXd -losgUtild -losgDBd -losgSimd -losgd -lOpenThreadsd
-else
-OSG_LIBS = -losgViewer -losgGA -losgText -losgFX -losgUtil -losgDB -losgSim -losg -lOpenThreads 
-endif
+GFX_CODE = fg_os_osgviewer.cxx fg_os_common.cxx fg_os.hxx
 
 JSBSIM_LIBS = \
 	$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
@@ -65,7 +51,11 @@ libMain_a_SOURCES = \
 	util.cxx util.hxx \
 	viewer.cxx viewer.hxx \
 	viewmgr.cxx viewmgr.hxx \
-	FGManipulator.cxx FGManipulator.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
@@ -73,11 +63,10 @@ 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/FDM/libFlight.a \
-	$(top_builddir)/src/FDM/Balloon/libBalloon.a \
 	$(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
 	$(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.a \
 	$(JSBSIM_LIBS) \
@@ -100,6 +89,7 @@ fgfs_LDADD = \
 	$(top_builddir)/src/Airports/libAirports.a \
 	$(MPLAYER_LIBS) \
         $(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 \