make isatty() available for stdout/stderr (hope it works on MS Windows)

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 15c4f6d0a47e333d52174817e5f241cafe6c2cda..0930f31217820830c0e685aff506b76796d699f1 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -19,10 +19,10 @@ GFX_COMMON = fg_os_common.cxx fg_os.hxx
 if USE_SDL
 GFX_CODE = fg_os_sdl.cxx $(GFX_COMMON)
 else
-if USE_OSGVIEWER
-GFX_CODE = fg_os_osgviewer.cxx $(GFX_COMMON)
-else
+if USE_GLUT
 GFX_CODE = fg_os.cxx $(GFX_COMMON)
+else
+GFX_CODE = fg_os_osgviewer.cxx $(GFX_COMMON)
 endif
 endif
 
@@ -60,8 +60,11 @@ libMain_a_SOURCES = \
        util.cxx util.hxx \
        viewer.cxx viewer.hxx \
        viewmgr.cxx viewmgr.hxx \
+       CameraGroup.cxx CameraGroup.hxx \
        FGManipulator.cxx FGManipulator.hxx \
        ViewPartitionNode.cxx ViewPartitionNode.hxx \
+       WindowSystemAdapter.hxx WindowSystemAdapter.cxx \
+       WindowBuilder.hxx WindowBuilder.cxx \
        $(GFX_CODE)
 
 fgfs_SOURCES = bootstrap.cxx
@@ -69,11 +72,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) \
@@ -96,6 +98,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 \