Merge branch 'jmt/acinclude'

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index a09c7cd58326b1d972dce22f13416527f5de454d..e0798d6d421c692834f9cec2e4d710e7366b5556 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,11 +1,7 @@
 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
 
-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
@@ -13,18 +9,34 @@ else
 SP_FDM_LIBS = 
 endif
 
-if WITH_THREADS
-THREAD_LIBS = -lsgthreads $(thread_LIBS)
+if ENABLE_ATCDCL
+ATCDCL_LIBS = $(top_builddir)/src/ATCDCL/libATCDCL.a
 else
-THREAD_LIBS =
+ATCDCL_LIBS = 
 endif
 
-if USE_SDL
-GFX_CODE = fg_os_sdl.cxx fg_os.hxx
+
+if WITH_EVENTINPUT
+EVENT_LIBS = $(eventinput_LIBS)
 else
-GFX_CODE = fg_os.cxx fg_os.hxx
+EVENT_LIBS =
 endif
 
+if HAVE_FRAMEWORK_PLIB
+fgfs_PLIB_FW = $(plib_FRAMEWORK)
+metar_PLIB_FW = $(plib_FRAMEWORK)
+else
+fgfs_PLIB_LIBS = -lplibpuaux -lplibpu -lplibfnt -lplibjs -lplibnet \
+       -lplibsg -lplibul 
+metar_PLIB_LIBS = -lplibnet -lplibul 
+endif
+
+if HAVE_FRAMEWORK_OSG
+fgfs_OSG_FW = $(osg_FRAMEWORKS) $(openthreads_FRAMEWORK)
+endif
+
+GFX_CODE = fg_os_osgviewer.cxx fg_os_common.cxx fg_os.hxx
+
 JSBSIM_LIBS = \
        $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
         $(top_builddir)/src/FDM/JSBSim/initialization/libInit.a \
@@ -48,6 +60,7 @@ noinst_LIBRARIES = libMain.a
 libMain_a_SOURCES = \
        main.cxx main.hxx \
        renderer.cxx renderer.hxx \
+       fgviewer.cxx fgviewer.hxx \
        fg_commands.cxx fg_commands.hxx \
        fg_init.cxx fg_init.hxx \
        fg_io.cxx fg_io.hxx \
@@ -59,18 +72,21 @@ libMain_a_SOURCES = \
        util.cxx util.hxx \
        viewer.cxx viewer.hxx \
        viewmgr.cxx viewmgr.hxx \
+       CameraGroup.cxx CameraGroup.hxx \
+       FGEventHandler.cxx FGEventHandler.hxx \
+       WindowSystemAdapter.hxx WindowSystemAdapter.cxx \
+       WindowBuilder.hxx WindowBuilder.cxx \
        $(GFX_CODE)
 
 fgfs_SOURCES = bootstrap.cxx
 
 fgfs_LDADD = \
-       $(top_builddir)/src/Main/libMain.a \
+       libMain.a \
        $(top_builddir)/src/Aircraft/libAircraft.a \
-       $(top_builddir)/src/ATC/libATC.a \
+       $(ATCDCL_LIBS) \
        $(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) \
@@ -83,6 +99,7 @@ fgfs_LDADD = \
        $(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/Network/libNetwork.a \
        $(top_builddir)/src/Navaids/libNavaids.a \
@@ -92,26 +109,33 @@ 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 \
-       -lsgstructure -lsgenvironment \
-       $(THREAD_LIBS) \
-       -lplibpu -lplibfnt -lplibjs -lplibnet -lplibssgaux -lplibssg -lplibsg -lplibul \
+       -lsgroute -lsgsky -lsgsound -lsgephem -lsgtgdb -lsgmodel -lsgbvh \
+       -lsgmaterial -lsgutil -lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket \
+       -lsgprops -lsgdebug -lsgmagvar -lsgmisc -lsgnasal -lsgxml -lsgsound \
+       -lsgserial -lsgstructure -lsgenvironment \
+        $(fgfs_PLIB_LIBS) \
+       $(OSG_LIBS) \
+       $(thread_LIBS) \
        $(network_LIBS) \
        -lz \
        $(opengl_LIBS) \
-       $(openal_LIBS)
+       $(openal_LIBS) \
+       $(EVENT_LIBS)
+
+fgfs_LDFLAGS = $(fgfs_PLIB_FW) $(fgfs_OSG_FW)
 
 metar_SOURCES = metar_main.cxx
 
 metar_LDADD = \
         -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
-        -lplibnet -lplibul $(network_LIBS) \
+        $(metar_PLIB_LIBS) $(network_LIBS) \
         -lz $(base_LIBS)
 
+metar_LDFLAGS = $(metar_PLIB_FW)
+
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim