On Wed, 13 Nov 2002 21:33:56 -0500 "Norman Vine" <[EMAIL PROTECTED]> wrote:
> > I realize that Patrick needed to change the > #ifdef WIN32 to #ifdef __CYGWIN__ > but this should not be necessary in that WIN32 should be > being #defined by our configure script and as it is written > this works on both Cygwin and MingW32 > Actually WIN32 gets defined by the configure script but config.h/simgear_config.h isn't included in all files. Changes to FlightGear: --------------------- Index: src/ATC/AIEntity.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/ATC/AIEntity.cxx,v retrieving revision 1.2 diff -r1.2 AIEntity.cxx 28a29,34 > > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > > #include <simgear/compiler.h> Index: src/ATC/AILocalTraffic.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/ATC/AILocalTraffic.cxx,v retrieving revision 1.3 diff -r1.3 AILocalTraffic.cxx 21a22,27 > > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > > #include <simgear/compiler.h> Index: src/Cockpit/hud.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/Cockpit/hud.cxx,v retrieving revision 1.1.1.1 diff -r1.1.1.1 hud.cxx 22a23,26 > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > Index: src/FDM/ADA.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/FDM/ADA.cxx,v retrieving revision 1.1.1.1 diff -r1.1.1.1 ADA.cxx 20a21,25 > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > > #include <simgear/compiler.h> Index: src/FDM/Balloon.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/FDM/Balloon.cxx,v retrieving revision 1.2 diff -r1.2 Balloon.cxx 39a40,43 > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > Index: src/FDM/NullFDM.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/FDM/NullFDM.cxx,v retrieving revision 1.1.1.1 diff -r1.1.1.1 NullFDM.cxx 23a24,29 > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > > #include <simgear/compiler.h> > Index: src/FDM/flight.hxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/FDM/flight.hxx,v retrieving revision 1.4 diff -r1.4 flight.hxx 83a84,87 > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > Index: src/FDM/JSBSim/JSBSim.cxx =================================================================== RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/FDM/JSBSim/JSBSim.cxx,v retrieving revision 1.5 diff -r1.5 JSBSim.cxx 23a24,27 > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > Index: src/FDM/UIUCModel/uiuc_wrapper.cpp =================================================================== RCS file: /var/cvs/FlightGear-0.9/FlightGear/src/FDM/UIUCModel/uiuc_wrapper.cpp,v retrieving revision 1.5 diff -r1.5 uiuc_wrapper.cpp 77a78,82 > #ifdef HAVE_CONFIG_H > # include <config.h> > #endif > > #include <simgear/compiler.h> --------------------- Changes to SimGear: --------------------- Index: simgear/bucket/newbucket.cxx =================================================================== RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/bucket/newbucket.cxx,v retrieving revision 1.1.1.1 diff -r1.1.1.1 newbucket.cxx 25a26,28 > #ifdef HAVE_CONFIG_H > # include <simgear_config.h> > #endif Index: simgear/io/sg_binobj.cxx =================================================================== RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/io/sg_binobj.cxx,v retrieving revision 1.1.1.1 diff -r1.1.1.1 sg_binobj.cxx 23a24,26 > #ifdef HAVE_CONFIG_H > # include <simgear_config.h> > #endif --------------------- With the patch from Norman in <014101c28f0c$271e4570$ad37ba8c@sfdev3> applied, FlightGear compiles without errors on my cygwin/gcc (there are a lot of warnings though but most are related to new stl headers in gcc 3.x). Patrick -- Patrick Stählin <[EMAIL PROTECTED]> _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
