Various tweaks for mingwin32.

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 9c1facff00ce025830d3f17b7c105cd272fe43c6..c07cc6f31ddde30fb1bd0f84d0c97f10bf51b0cd 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -1072,7 +1072,7 @@ void FGRadioStack::search()
 
     if ( current_navlist->query( lon, lat, elev, adf_freq, &nav ) ) {
        char freq[128];
-#if defined( _MSC_VER )
+#if defined( _MSC_VER ) || defined(__MINGW32__)
        _snprintf( freq, 10, "%.0f", adf_freq );
 #else
        snprintf( freq, 10, "%.0f", adf_freq );

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 7165a56543c1c97183bcc9b3bca9eba155a104db..6dfeae80c40cb3d45c9c91893b6c48c72dde8112 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -1,11 +1,17 @@
 noinst_LIBRARIES = libGUI.a
 
+if ENABLE_NETWORK_OLK
+NETWORK_SRCS = net_dlg.cxx net_dlg.hxx 
+else
+NETWORK_SRCS = 
+endif
+
 libGUI_a_SOURCES = \
        apt_dlg.cxx apt_dlg.hxx \
        gui.cxx gui.h \
        gui_local.cxx gui_local.hxx \
        mouse.cxx \
-       net_dlg.cxx net_dlg.hxx \
+       $(NETWORK_SRCS) \
        sgVec3Slider.cxx sgVec3Slider.hxx \
        trackball.c trackball.h
 

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 853b9516d8ebcd6119a785865c64a664e91233b6..58db573ce9845e3f6eada5a98ac851b44b36ab0c 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -75,7 +75,7 @@
 #include <NetworkOLK/network.h>
 #endif
    
-#if defined( WIN32 ) && !defined( __CYGWIN__ )
+#if defined( WIN32 ) && !defined( __CYGWIN__ ) && !defined(__MINGW32__)
 #  include <simgear/screen/win32-printer.h>
 #  include <simgear/screen/GlBitmaps.h>
 #endif
@@ -92,7 +92,7 @@ SG_USING_STD(string);
 SG_USING_STD(cout);
 #endif
 
-#ifdef  _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #define  snprintf    _snprintf
 #endif   /* _MSC_VER */
 
@@ -672,7 +672,7 @@ void fgHiResDump()
 #endif // #if defined( TR_HIRES_SNAP)
 
 
-#if defined( WIN32 ) && !defined( __CYGWIN__)
+#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
 
 static void rotateView( double roll, double pitch, double yaw )
 {
@@ -711,7 +711,7 @@ GLubyte *hiResScreenCapture( int multiplier )
 #endif
 
 
-#if defined( WIN32 ) && !defined( __CYGWIN__)
+#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
 // win32 print screen function
 void printScreen ( puObject *obj ) {
     bool show_pu_cursor = false;
@@ -843,7 +843,7 @@ The menu stuff
 ---------------------------------------------------------------------*/
 char *fileSubmenu               [] = {
     "Exit", /* "Close", "---------", */
-#if defined( WIN32 ) && !defined( __CYGWIN__)
+#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
     "Print",
 #endif
     "Snap Shot",
@@ -856,7 +856,7 @@ char *fileSubmenu               [] = {
 };
 puCallback fileSubmenuCb        [] = {
     MayBeGoodBye, /* hideMenuCb, NULL, */
-#if defined( WIN32 ) && !defined( __CYGWIN__)
+#if defined( WIN32 ) && !defined( __CYGWIN__) && !defined(__MINGW32__)
     printScreen, 
 #endif
     /* NULL, notCb, */

diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index fd7311f76c768a6991a79815bc671daed42b33d3..8ecb107338d8425263c25c56206777c7bae02c82 100644 (file)
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -68,11 +68,6 @@
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
 
-#if defined( WIN32 ) && !defined( __CYGWIN__ )
-#  include <simgear/screen/win32-printer.h>
-#  include <simgear/screen/GlBitmaps.h>
-#endif
-
 #include "gui.h"
 #include "gui_local.hxx"
 

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index 7631dd16273ec31801e0882651b6856de37f85e6..691c9df1a09e72e372199c4ccb9b1646e6228b6a 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -36,6 +36,9 @@ SG_USING_STD(ios);
 #endif
 SG_USING_STD(string);
 
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define snprintf _snprintf
+#endif
 
 string axes_humannames[8] = { "elevator", "ailerons", "rudder", "throttle", 
                               "mixture","propller pitch", "lateral view",