Refined conditional audio support compilation.

Moved texture parameter setup calls to ../Scenery/materials.cxx
#include <string.h> before various STL includes.
Make HUD default state be enabled.

diff --git a/Main/GLUTmain.cxx b/Main/GLUTmain.cxx
index b80378d166a928730887ea04bd74cece80d0a1cf..c85e8f15afac365e8ab5d776533843ef57189a85 100644 (file)
--- a/Main/GLUTmain.cxx
+++ b/Main/GLUTmain.cxx
@@ -52,9 +52,9 @@
 #include <Astro/stars.hxx>
 #include <Astro/sun.hxx>
 
-#ifdef HAVE_OSS_AUDIO
-#  include <Audio/sl.h>
-#  include <Audio/sm.h>
+#ifdef HAVE_AUDIO_SUPPORT
+#  include <Audio/src/sl.h>
+#  include <Audio/src/sm.h>
 #endif
 
 #include <Cockpit/cockpit.hxx>
@@ -89,7 +89,7 @@ int use_signals = 0;
 int displayInstruments; 
 
 // Global structures for the Audio library
-#ifdef HAVE_OSS_AUDIO
+#ifdef HAVE_AUDIO_SUPPORT
 slScheduler audio_sched ( 8000 ) ;
 smMixer audio_mixer ;
 slSample *s1;
@@ -365,13 +365,6 @@ static void fgRenderFrame( void ) {
     if ( o->textures ) {
        // texture parameters
        xglEnable( GL_TEXTURE_2D );
-       xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT ) ;
-       xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT ) ;
-       xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ) ;
-       xglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 
-                         GL_LINEAR /* GL_LINEAR_MIPMAP_LINEAR */ ) ;
-       xglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ) ;
-       xglHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ) ;
        // set base color (I don't think this is doing anything here)
        xglMaterialfv (GL_FRONT, GL_AMBIENT, white);
        xglMaterialfv (GL_FRONT, GL_DIFFUSE, white);
@@ -562,7 +555,7 @@ static void fgMainLoop( void ) {
     global_events.Process();
 
     // Run audio scheduler
-#ifdef HAVE_OSS_AUDIO
+#ifdef HAVE_AUDIO_SUPPORT
     audio_sched.update();
 #endif
 
@@ -722,7 +715,7 @@ int main( int argc, char **argv ) {
     guiInit();
 
     // Initialize audio support
-#ifdef HAVE_OSS_AUDIO
+#ifdef HAVE_AUDIO_SUPPORT
     audio_mixer . setMasterVolume ( 30 ) ;  /* 50% of max volume. */
     audio_sched . setSafetyMargin ( 1.0 ) ;
     strcpy(path, o->fg_root);
@@ -752,6 +745,12 @@ int main( int argc, char **argv ) {
 
 
 // $Log$
+// Revision 1.27  1998/06/17 21:35:10  curt
+// Refined conditional audio support compilation.
+// Moved texture parameter setup calls to ../Scenery/materials.cxx
+// #include <string.h> before various STL includes.
+// Make HUD default state be enabled.
+//
 // Revision 1.26  1998/06/13 00:40:32  curt
 // Tweaked fog command line options.
 //

diff --git a/Main/Makefile.am b/Main/Makefile.am
index a63b60482d50f107b6af1997487a6fcdb9262d4f..d16e084d03e944ad4db412b608b8d1b4545ae8b3 100644 (file)
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -1,6 +1,12 @@
-if HAVE_OSS_AUDIO
-DEFS += -DHAVE_OSS_AUDIO
-AUDIO_LIBS = $(top_builddir)/Lib/Audio/libAudio.la
+if HAVE_AUDIO_SUPPORT
+DEFS += -DHAVE_AUDIO_SUPPORT
+AUDIO_LIBS = \
+       $(top_builddir)/Lib/Audio/src/libsl.la \
+       $(top_builddir)/Lib/Audio/src/libsm.la
+endif
+
+if HAVE_WIN32_AUDIO
+LIBS += -lwinmm
 endif
 
 EXTRA_DIST = runfg.in runfg.bat.in

diff --git a/Main/airports.hxx b/Main/airports.hxx
index 9402930283a223dcbb9c0315550187e3fa9bbee6..a0b6d2853b8f8aafc9b27dd12ac201ecafedb4a0 100644 (file)
--- a/Main/airports.hxx
+++ b/Main/airports.hxx
@@ -34,8 +34,8 @@
 #endif                                   
 
 
-#include <map>             // STL associative "array"
 #include <string>          // Standard C++ string library
+#include <map>             // STL associative "array"
 
 
 typedef struct {
@@ -70,6 +70,12 @@ public:
 
 
 // $Log$
+// Revision 1.5  1998/06/17 21:35:11  curt
+// Refined conditional audio support compilation.
+// Moved texture parameter setup calls to ../Scenery/materials.cxx
+// #include <string.h> before various STL includes.
+// Make HUD default state be enabled.
+//
 // Revision 1.4  1998/06/03 00:47:14  curt
 // Updated to compile in audio support if OSS available.
 // Updated for new version of Steve's audio library.

diff --git a/Main/fg_init.cxx b/Main/fg_init.cxx
index 113da6cba19aa90739d93b50da63873c1f9a3cc2..5978b3c0eb20febfbe33d94baddb4dbb819f22fc 100644 (file)
--- a/Main/fg_init.cxx
+++ b/Main/fg_init.cxx
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <Include/fg_constants.h>
 #include <Include/general.h>
@@ -386,6 +387,12 @@ int fgInitSubsystems( void ) {
 
 
 // $Log$
+// Revision 1.20  1998/06/17 21:35:12  curt
+// Refined conditional audio support compilation.
+// Moved texture parameter setup calls to ../Scenery/materials.cxx
+// #include <string.h> before various STL includes.
+// Make HUD default state be enabled.
+//
 // Revision 1.19  1998/06/08 17:57:05  curt
 // Minor sound/startup position tweaks.
 //

diff --git a/Main/options.cxx b/Main/options.cxx
index 8e0894aa465a8088d0496a7c8a42dff3b115fe36..b6908d6814b54cbd3f69903f70f8dea01101e196 100644 (file)
--- a/Main/options.cxx
+++ b/Main/options.cxx
@@ -68,7 +68,7 @@ fgOPTIONS::fgOPTIONS( void ) {
     strcpy(airport_id, "");
 
     // Features
-    hud_status = 0;
+    hud_status = 1;
 
     // Rendering options
     fog = 2;    // nicest
@@ -433,6 +433,12 @@ fgOPTIONS::~fgOPTIONS( void ) {
 
 
 // $Log$
+// Revision 1.12  1998/06/17 21:35:13  curt
+// Refined conditional audio support compilation.
+// Moved texture parameter setup calls to ../Scenery/materials.cxx
+// #include <string.h> before various STL includes.
+// Make HUD default state be enabled.
+//
 // Revision 1.11  1998/06/13 00:40:33  curt
 // Tweaked fog command line options.
 //