Merge branch 'jt/runway' into next

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 5ac0cf0b9ccd6278cc5d907a4c01b511712a3a92..0af345baddde3233b8e5ce1401f3a67947ec5ae2 100644 (file)
--- 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.hxx
+             fg_os_osgviewer.cxx fg_os.hxx
 
 MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
 
@@ -15,11 +15,7 @@ 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
 
 JSBSIM_LIBS = \
        $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
@@ -55,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
@@ -62,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) \
@@ -78,8 +78,8 @@ fgfs_LDADD = \
        $(top_builddir)/src/Autopilot/libAutopilot.a \
        $(top_builddir)/src/Input/libInput.a \
        $(top_builddir)/src/Instrumentation/KLN89/libKLN89.a \
-       $(top_builddir)/src/Instrumentation/HUD/libHUD.a \
        $(top_builddir)/src/Instrumentation/libInstrumentation.a \
+       $(top_builddir)/src/Instrumentation/HUD/libHUD.a \
        $(top_builddir)/src/Model/libModel.a \
        $(top_builddir)/src/Network/libNetwork.a \
        $(top_builddir)/src/Navaids/libNavaids.a \
@@ -89,16 +89,19 @@ 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 \
        $(top_builddir)/src/Environment/libEnvironment.a \
        -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) \
-       -lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssgaux -lplibssg -lplibsg -lplibul \
        $(network_LIBS) \
        -lz \
        $(opengl_LIBS) \