Force initial ssgState before doing ssg cull and render pass so that the

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

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 58d5d55e8f16452836bad84a5f86ebefde5642ba..a6492a22b29da85f1aead074bf6e0c14449df071 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,33 +1,10 @@
-if ENABLE_AUDIO_SUPPORT
-DEFS += -DENABLE_AUDIO_SUPPORT
-AUDIO_LIBS = -lsl -lsm
-endif
-
-if ENABLE_IRIX_AUDIO
-LIBS += -laudio
-endif
-
-if ENABLE_WIN32_AUDIO
-LIBS += -lwinmm
-endif
-
-if ENABLE_PLIB_JOYSTICK
-DEFS += -DENABLE_PLIB_JOYSTICK
-else
-DEFS += -DENABLE_GLUT_JOYSTICK
-endif
-
-if ENABLE_XMESA_FX
-DEFS += -DXMESA -DFX
-endif
-
 if ENABLE_UNIX_SERIAL
 SERIAL_LIBS = $(top_builddir)/Lib/Serial/libSerial.a
 else
 SERIAL_LIBS =
 endif
 
-DEFS += -DPKGLIBDIR=\"$(pkglibdir)\"
+CPPFLAGS += -DUSE_SSG -DPKGLIBDIR=\"$(pkglibdir)\"
 
 EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
 
@@ -36,9 +13,10 @@ bin_PROGRAMS = fgfs
 bin_SCRIPTS = runfgfs runfgfs.bat
 
 fgfs_SOURCES = \
-       GLUTkey.cxx GLUTkey.hxx GLUTmain.cxx \
        fg_init.cxx fg_init.hxx \
        fg_serial.cxx fg_serial.hxx \
+       keyboard.cxx keyboard.hxx \
+       main.cxx \
        options.cxx options.hxx \
        splash.cxx splash.hxx \
        views.cxx views.hxx
@@ -57,19 +35,21 @@ fgfs_LDADD = \
        $(top_builddir)/Simulator/GUI/libGUI.a \
        $(top_builddir)/Simulator/Scenery/libScenery.a \
        $(top_builddir)/Simulator/Airports/libAirports.a \
+        $(top_builddir)/Simulator/Network/libNetwork.a \
        $(top_builddir)/Simulator/Objects/libObjects.a \
        $(top_builddir)/Simulator/Time/libTime.a \
        $(top_builddir)/Simulator/Weather/libWeather.a \
        $(top_builddir)/Simulator/Joystick/libJoystick.a \
-       $(AUDIO_LIBS) \
        $(SERIAL_LIBS) \
        $(top_builddir)/Lib/Math/libMath.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Debug/libDebug.a \
-       -lpu -lfnt \
+       -lpu -lfnt -lssg -lsg \
        $(top_builddir)/Lib/Misc/libMisc.a \
        $(top_builddir)/Lib/zlib/libz.a \
-       $(opengl_LIBS)
+       $(opengl_LIBS) \
+       $(audio_LIBS)
+
 
 INCLUDES += \
        -I$(top_builddir) \