fly/flightgear
1
0
Fork 0
Code Activity

Various tweaks for mingwin32.

Browse source
This commit is contained in:
curt 2001-08-14 22:18:19 +00:00
parent 59ccf90a60
commit 0d76618950
5 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Cockpit/radiostack.cxx
View file

@ -1072,7 +1072,7 @@ void FGRadioStack::search()
if ( current_navlist->query( lon, lat, elev, adf_freq, &nav ) ) { if ( current_navlist->query( lon, lat, elev, adf_freq, &nav ) ) {
char freq[128]; char freq[128];
#if defined( _MSC_VER ) #if defined( _MSC_VER ) || defined(__MINGW32__)
_snprintf( freq, 10, "%.0f", adf_freq ); _snprintf( freq, 10, "%.0f", adf_freq );
#else #else
snprintf( freq, 10, "%.0f", adf_freq ); snprintf( freq, 10, "%.0f", adf_freq );

8
src/GUI/Makefile.am
View file

@ -1,11 +1,17 @@
noinst_LIBRARIES = libGUI.a noinst_LIBRARIES = libGUI.a
if ENABLE_NETWORK_OLK
NETWORK_SRCS = net_dlg.cxx net_dlg.hxx
else
NETWORK_SRCS =
endif
libGUI_a_SOURCES = \ libGUI_a_SOURCES = \
apt_dlg.cxx apt_dlg.hxx \ apt_dlg.cxx apt_dlg.hxx \
gui.cxx gui.h \ gui.cxx gui.h \
gui_local.cxx gui_local.hxx \ gui_local.cxx gui_local.hxx \
mouse.cxx \ mouse.cxx \
net_dlg.cxx net_dlg.hxx \ $(NETWORK_SRCS) \
sgVec3Slider.cxx sgVec3Slider.hxx \ sgVec3Slider.cxx sgVec3Slider.hxx \
trackball.c trackball.h trackball.c trackball.h

12
src/GUI/gui.cxx
View file

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

5
src/GUI/mouse.cxx
View file

@ -68,11 +68,6 @@
#include <Main/fg_props.hxx> #include <Main/fg_props.hxx>
#include <Main/viewmgr.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.h"
#include "gui_local.hxx" #include "gui_local.hxx"

3
src/Input/fgjs.cxx
View file

@ -36,6 +36,9 @@ SG_USING_STD(ios);
#endif #endif
SG_USING_STD(string); SG_USING_STD(string);
#if defined(_MSC_VER) || defined(__MINGW32__)
#define snprintf _snprintf
#endif
string axes_humannames[8] = { "elevator", "ailerons", "rudder", "throttle", string axes_humannames[8] = { "elevator", "ailerons", "rudder", "throttle",
"mixture","propller pitch", "lateral view", "mixture","propller pitch", "lateral view",