From 7a29382efc6c87fc96c5477b0194acd66235713c Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 29 May 1998 20:29:32 +0000 Subject: [PATCH] EGCS addendum to README.Win32 Added Tests/ to clean-deps in Makefile.extra Additional credits in Thanks. Tweaked configure.in to add Win32 specific things if #include exists, rather than just if it's a cygwin32 environment. --- Makefile.extra | 3 ++- README.Win32 | 43 +++++++++++++++++++++++++++++++++++++++++++ Thanks | 16 ++++++++++++++++ configure.in | 10 ++++++---- 4 files changed, 67 insertions(+), 5 deletions(-) diff --git a/Makefile.extra b/Makefile.extra index 1beb9b297..339f01f33 100644 --- a/Makefile.extra +++ b/Makefile.extra @@ -11,7 +11,8 @@ clean-deps: rm -rf .deps \ Lib/.deps Simulator/.deps Tools/.deps Test/.deps \ Lib/*/.deps Simulator/*/.deps Tools/*/.deps \ - Lib/*/*/.deps Simulator/*/*/.deps Tools/*/*/.deps + Lib/*/*/.deps Simulator/*/*/.deps Tools/*/*/.deps \ + Tests/.deps clean-libs: rm -rf .libs Lib/.libs Simulator/.libs Tools/.libs \ diff --git a/README.Win32 b/README.Win32 index ed0608e2d..1e0f5ddf2 100644 --- a/README.Win32 +++ b/README.Win32 @@ -132,3 +132,46 @@ Important Note: so far you've built and installed the simulator and 13. I appreciate feedback. Tell me if it works! If it doesn't, tell me what went wrong. My email is curt@me.umn.edu + + +=========================================================================== + +!!!IMPORTANT ADDENDUM FOR FlightGear 0.48 and UP!!! + +For those using Cygwin32 to build from source on win95/NT ... I've +run into a show stopping bug with the cygnus compiler where it can't +compile legit C++ code that includes the string class as a part of a +structure built from the STL. Fortunately, EGCS fixes this and many +other problems with the cygwin32 compiler. If you are a cygwin32 user +and want to be able to compile FG 0.48 you will have to upgrade your +Cygnus installation from beta 19 to beta 19.1, and overlay the EGCS +update over top of the Cygnus installation. + +If anyone is interested I can send them a small test program that +exercises this bug in the cygwin32 compiler, but passes with flying +colors through EGCS. + +The Cygwin32 beta 19.1 upgrade is available from: + + ftp://ftp.cygnus.com/pub/gnu-win32/latest/b19.1-update/ + +Make sure to follow the directions you find there (it's less than +200Kb to download.) + +The EGCS upgrade is available from: + + http://www.xraylith.wisc.edu/~khan/software/gnu-win32/egcs.html + +Again, make sure you follow the directions. (This is several +megabytes to download.) It is recommended that you unroll the egcs +stuff over top of your cygwin32 installation. It will replace many of +the files. I did this today and if you carefully follow the +directions you shouldn't have any trouble. :-) + +Note: you don't have to wait for FG 0.48 to be released to upgrade to +EGCS, it should build earlier versions of FG just fine. I hope +... :-) I've gone through the process once myself, so I guess that +makes me the expert. Feel free to forward questions to me at: + + + diff --git a/Thanks b/Thanks index 22b47d707..3e2f3b99f 100644 --- a/Thanks +++ b/Thanks @@ -41,6 +41,11 @@ Didier Chauveau http://edcwww.cr.usgs.gov/landdaac/gtopo30/gtopo30.html +Francine Evans + http://www.cs.sunysb.edu/~evans/stripe.html + Wrote the @#$@#$@% GPL'd tri-striper we use and "love". :-) + + Jean-loup Gailly and Mark Adler Authors of the zlib library. Used for on-the-fly compression and decompression routines. @@ -82,6 +87,11 @@ Anders Morken Maintains the European mirror of the FG web pages. +Alan Murta + http://www.cs.man.ac.uk/aig/staff/alan/software/ + Created the Generic Polygon Clipping library + + Jonathan R Shewchuk Author of the Triangle program. Triangle is used to calculate the Delauney triangulation of our irregular terrain. @@ -98,6 +108,12 @@ Petter Reinholdtsen environments since the don't use the Unix make system. +Chris Schoeneman + Contributed some 3d sound playing code for Irix, Win32, and Linux + It is unclear if this code will be used directly, but it certainly + will have an influence on the development of our own audio library. + + Durk Talsma Accurate Sun, Moon, and Planets. Sun changes color based on position in sky. Moon has correct phase and blends well into the diff --git a/configure.in b/configure.in index f908148b9..90c3c1dc1 100644 --- a/configure.in +++ b/configure.in @@ -23,8 +23,10 @@ AM_MAINTAINER_MODE dnl Check to see if this `configure' is being run in the `Cygwin32' environment AM_CYGWIN32 +AC_CHECK_HEADER(windows.h) + dnl extra library and include directories -if test "x$am_cv_cygwin32" = "xyes" ; then +if test "x$am_cv_header_windows_h" = "xyes" ; then wi_EXTRA_DIRS(no, /store /usr/local /local /user/local /usr/share \ /usr/X11R6 /opt/X11R6 `pwd`/Win32) else @@ -68,10 +70,10 @@ fi AC_CHECK_LIB(glut, glutGetModifiers) -dnl cygwin32 is a little wierd because it has to try to handle the various +dnl Win32 is a little wierd because it has to try to handle the various dnl winbloze-isms. We'll just do this manually for now. -if test "x$am_cv_cygwin32" = "xyes" ; then - echo Cygnus Win32 specific hacks... +if test "x$ac_cv_header_windows_h" = "xyes" ; then + echo Win32 specific hacks... AC_DEFINE(WIN32) dnl Note, the double square brackets are required becuase single brackets -- 2.39.5