Changes to get SimGear to configure and compile out-of-the-box on

a MinGW target:

Link against alut.dll in addition to openal32.dll.

Remove some preprocessor defines from compiler.h that were
confusing the mingw and/or libstdc++ headers (I put the _isnan
one back in the only file it was used).

Hack a broken sleep() call into the OpenAL sample programs so
that they will compile (but not work) in a non-POSIX environment.

Change the header file ordering in sample_openal.hxx to get
around some really weird interactions between MinGW's windows.h
and the gcc iostream header.

diff --git a/configure.ac b/configure.ac
index 0e9bdd915533c00d7350e79b18f5fae2974045f8..7a87af310795cfd6459151cec4ddf4693b6b3597 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -275,7 +275,7 @@ case "${host}" in
 *-*-cygwin* | *-*-mingw32*)
     dnl CygWin under Windoze.
 
-    LIBS="$LIBS -lopenal32 -lwinmm -ldsound -ldxguid -lole32"
+    LIBS="$LIBS -lalut -lopenal32 -lwinmm -ldsound -ldxguid -lole32"
     ;;
 
 *-apple-darwin*)

diff --git a/simgear/compiler.h b/simgear/compiler.h
index 52cf339533d5703bfe563917f8995145eb079ee9..9123ab19729285723002a510378ddf1fefd99e65 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -149,13 +149,6 @@
 
 #endif // __GNUC__
 
-#if defined( __MINGW32__ )
-#  define bcopy(from, to, n) memcpy(to, from, n)
-#  define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
-#  define isnan _isnan
-#  define snprintf _snprintf
-#endif
-
 /* KAI C++ */
 #if defined(__KCC)
 

diff --git a/simgear/scene/sky/cloud.cxx b/simgear/scene/sky/cloud.cxx
index 7042c568c95b567be4ec8b025c729a429499640f..f6278bdcbc314ad4f332d5616996ab9e62da449a 100644 (file)
--- a/simgear/scene/sky/cloud.cxx
+++ b/simgear/scene/sky/cloud.cxx
@@ -41,6 +41,10 @@
 
 #include "cloud.hxx"
 
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define isnan(x) _isnan(x)
+#endif
+
 
 static ssgStateSelector *layer_states[SGCloudLayer::SG_MAX_CLOUD_COVERAGES];
 static bool state_initialized = false;

diff --git a/simgear/sound/openal_test1.cxx b/simgear/sound/openal_test1.cxx
index 0a62ef1e052bcad62ee568c93ba4c6824468e6e1..5d56bc9e83222ae9df692ad0faa3b61a876b108d 100644 (file)
--- a/simgear/sound/openal_test1.cxx
+++ b/simgear/sound/openal_test1.cxx
@@ -1,5 +1,12 @@
 #include <stdio.h>
+
+#ifdef __MINGW32__
+// This is broken, but allows the file to compile without a POSIX
+// environment.
+static unsigned int sleep(unsigned int secs) { return 0; }
+#else
 #include <unistd.h>    // sleep()
+#endif
 
 #if defined( __APPLE__ )
 # define AL_ILLEGAL_ENUM AL_INVALID_ENUM

diff --git a/simgear/sound/openal_test2.cxx b/simgear/sound/openal_test2.cxx
index 63353ab67ec107a062976927d2d1923a605ab795..bee6c4e7a2f85df2ae30833b0e3b17ca1773ca51 100644 (file)
--- a/simgear/sound/openal_test2.cxx
+++ b/simgear/sound/openal_test2.cxx
@@ -1,5 +1,11 @@
 #include <stdio.h>
+#ifdef __MINGW32__
+// This is broken, but allows the file to compile without a POSIX
+// environment.
+static unsigned int sleep(unsigned int secs) { return 0; }
+#else
 #include <unistd.h>    // sleep()
+#endif
 
 #include "sample_openal.hxx"
 #include "soundmgr_openal.hxx"

diff --git a/simgear/sound/sample_openal.hxx b/simgear/sound/sample_openal.hxx
index a7bfe03fc226442e5eeb064255e43abbe5ce892c..0a5afdacd117b474fcd130bbf27ac7b8223b17db 100644 (file)
--- a/simgear/sound/sample_openal.hxx
+++ b/simgear/sound/sample_openal.hxx
@@ -36,6 +36,10 @@
 
 #include STL_STRING
 
+#include <simgear/debug/logstream.hxx>
+
+#include <plib/sg.h>
+
 #if defined(__APPLE__)
 # define AL_ILLEGAL_ENUM AL_INVALID_ENUM
 # define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
@@ -46,13 +50,8 @@
 # include <AL/alut.h>
 #endif
 
-#include <plib/sg.h>
-
-#include <simgear/debug/logstream.hxx>
-
 SG_USING_STD(string);
 
-
 /**
  * manages everything we need to know for an individual sound sample
  */