Hi folks, The following patch needs to be applied to fix the errors that Georg Vollnhals was getting whilst attempting to compile SimGear with gcc-3.4.x in a thread a week or so ago. Could someone with CVS access commit it please - it's the old picking up the -DNOMINMAX definition from config.h thing again.
Note that 3 changes to 2 header files in our downloadable openal_cyg.tgz described in: http://baron.flightgear.org/pipermail/flightgear-devel/2005-March/035270.htm l needed to be applied before I could compile successfully. Could someone apply these to our tarball please? Cheers - Dave Index: simgear/ephemeris/ephemeris.cxx =================================================================== RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/ephemeris/ephemeris.cxx,v retrieving revision 1.3 diff -u -r1.3 ephemeris.cxx --- simgear/ephemeris/ephemeris.cxx 19 Nov 2004 21:44:16 -0000 1.3 +++ simgear/ephemeris/ephemeris.cxx 7 Oct 2005 09:06:49 -0000 @@ -22,6 +22,9 @@ // // $Id: ephemeris.cxx,v 1.3 2004/11/19 21:44:16 curt Exp $ +#ifdef HAVE_CONFIG_H +# include <simgear_config.h> +#endif #include <iostream> Index: simgear/ephemeris/stardata.cxx =================================================================== RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/ephemeris/stardata.cxx,v retrieving revision 1.3 diff -u -r1.3 stardata.cxx --- simgear/ephemeris/stardata.cxx 19 Nov 2004 21:44:16 -0000 1.3 +++ simgear/ephemeris/stardata.cxx 7 Oct 2005 09:06:49 -0000 @@ -21,6 +21,9 @@ // // $Id: stardata.cxx,v 1.3 2004/11/19 21:44:16 curt Exp $ +#ifdef HAVE_CONFIG_H +# include <simgear_config.h> +#endif #include <simgear/debug/logstream.hxx> #include <simgear/misc/sgstream.hxx> Index: simgear/io/decode_binobj.cxx =================================================================== RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/io/decode_binobj.cxx,v retrieving revision 1.2 diff -u -r1.2 decode_binobj.cxx --- simgear/io/decode_binobj.cxx 31 Dec 2002 14:47:35 -0000 1.2 +++ simgear/io/decode_binobj.cxx 7 Oct 2005 09:06:49 -0000 @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +# include <simgear_config.h> +#endif + #include <simgear/compiler.h> #include <unistd.h> Index: simgear/io/sg_socket_udp.cxx =================================================================== RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/io/sg_socket_udp.cxx,v retrieving revision 1.3 diff -u -r1.3 sg_socket_udp.cxx --- simgear/io/sg_socket_udp.cxx 19 Nov 2004 21:44:16 -0000 1.3 +++ simgear/io/sg_socket_udp.cxx 7 Oct 2005 09:06:49 -0000 @@ -20,6 +20,9 @@ // // $Id: sg_socket_udp.cxx,v 1.3 2004/11/19 21:44:16 curt Exp $ +#ifdef HAVE_CONFIG_H +# include <simgear_config.h> +#endif #include <simgear/compiler.h> Index: simgear/scene/sky/moon.cxx =================================================================== RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/scene/sky/moon.cxx,v retrieving revision 1.6 diff -u -r1.6 moon.cxx --- simgear/scene/sky/moon.cxx 29 Jan 2004 18:25:55 -0000 1.6 +++ simgear/scene/sky/moon.cxx 7 Oct 2005 09:06:49 -0000 @@ -24,6 +24,9 @@ // // $Id: moon.cxx,v 1.6 2004/01/29 18:25:55 ehofman Exp $ +#ifdef HAVE_CONFIG_H +# include <simgear_config.h> +#endif #include <simgear/compiler.h> Index: simgear/screen/shader.cpp =================================================================== RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/screen/shader.cpp,v retrieving revision 1.2 diff -u -r1.2 shader.cpp --- simgear/screen/shader.cpp 5 Sep 2005 08:17:38 -0000 1.2 +++ simgear/screen/shader.cpp 7 Oct 2005 09:06:50 -0000 @@ -18,6 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef HAVE_CONFIG_H +# include <simgear_config.h> +#endif #include <simgear/debug/logstream.hxx> #include "shader.h" This message has been checked for viruses but the contents of an attachment may still contain software viruses, which could damage your computer system: you are advised to perform your own checks. Email communications with the University of Nottingham may be monitored as permitted by UK legislation. _______________________________________________ Flightgear-devel mailing list [email protected] http://mail.flightgear.org/mailman/listinfo/flightgear-devel 2f585eeea02e2c79d7b1d8c4963bae2d
