Prepare a DIFF of MOST folders, with OUTPUT to tempdiff.txt file 
Using sources from C:\FGCVS ... 
#BEGIN FlightGear 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\FlightGear\source FlightGear 
#DIFF ==================================================================== 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\FlightGear\source\src\Instrumentation\mk_viii.cxx FlightGear\src\Instrumentation\mk_viii.cxx
--- C:\FGCVS\FlightGear\source\src\Instrumentation\mk_viii.cxx	Thu Oct 23 18:43:35 2008
+++ FlightGear\src\Instrumentation\mk_viii.cxx	Mon Nov 03 19:26:22 2008
@@ -2290,7 +2290,8 @@
       catch (const sg_exception &e)
 	{
 	  SG_LOG(SG_INSTR, SG_ALERT, "Error loading MK VIII sound sample \"" + filename + "\": " + e.getFormattedMessage());
-	  exit(1);
+      // WHY exit(1);
+      return NULL;  // should be OK to return NULL
 	}
 
       soundmgr->add(sample, refname.str());
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\FlightGear\source\src\Main\util.cxx FlightGear\src\Main\util.cxx
--- C:\FGCVS\FlightGear\source\src\Main\util.cxx	Sun Jul 27 18:25:15 2008
+++ FlightGear\src\Main\util.cxx	Mon Nov 03 15:01:32 2008
@@ -17,7 +17,11 @@
 //
 // $Id: util.cxx,v 1.21 2008/07/27 16:25:15 ehofman Exp $
 
-
+#ifdef _MSC_VER
+// these MUST be included in this ORDER
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
 #include <simgear/compiler.h>
 
 #include <math.h>
@@ -216,6 +220,16 @@
     SGPropertyNode *prop = write ? w : r;
     prop->setStringValue(str);
     const char *result = prop->getStringValue();
+#ifdef _MSC_VER
+    if (result[0])
+        return result;
+    if( str && str[0] )
+    {
+        struct _stat buf;
+        if( _stat( str, &buf ) == 0 )
+            result = str;
+    }
+#endif // _MSC_VER
     return result[0] ? result : 0;
 }
 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\FlightGear\source\src\Navaids\positioned.cxx FlightGear\src\Navaids\positioned.cxx
--- C:\FGCVS\FlightGear\source\src\Navaids\positioned.cxx	Mon Sep 08 21:25:45 2008
+++ FlightGear\src\Navaids\positioned.cxx	Sat Nov 01 19:02:22 2008
@@ -147,6 +147,10 @@
   {
     return a < b->type();
   }
+  bool operator()(const FGPositioned* a, const FGPositioned* b) const
+  {
+    return a->type() < b->type();
+  }
 };
 
 static void
#END ==================================================================== 
#BEGIN freeglut 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\freeglut freeglut 
#DIFF ==================================================================== 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\freeglut\include\GL\freeglut_std.h freeglut\include\GL\freeglut_std.h
--- C:\FGCVS\freeglut\include\GL\freeglut_std.h	Sat Apr 19 11:55:12 2008
+++ freeglut\include\GL\freeglut_std.h	Fri Oct 31 16:33:48 2008
@@ -55,7 +55,9 @@
 #   endif
 
 #   define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #   define NOMINMAX
+#endif // #ifndef NOMINMAX
 #   include <Windows.h>
 
 /* Windows static library */
#END ==================================================================== 
#BEGIN OpenSceneGraph 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\OpenSceneGraph OpenSceneGraph 
#DIFF ==================================================================== 
#END ==================================================================== 
#BEGIN PLIB 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\PLIB PLIB 
#DIFF ==================================================================== 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\PLIB\src\js\jsWindows.cxx PLIB\src\js\jsWindows.cxx
--- C:\FGCVS\PLIB\src\js\jsWindows.cxx	Fri Apr 18 11:03:44 2008
+++ PLIB\src\js\jsWindows.cxx	Wed Nov 05 14:32:12 2008
@@ -25,6 +25,8 @@
 
 #if defined (UL_WIN32)
 
+extern int getJSName( char * name, int len );
+
 #define _JS_MAX_AXES_WIN 8  /* X,Y,Z,R,U,V,POV_X,POV_Y */
 
 struct os_specific_s {
@@ -117,10 +119,13 @@
     // at least for USB.  Try to get the real name from the registry.
     if ( ! os->getOEMProductName ( this, name, sizeof(name) ) )
     {
-      ulSetError ( UL_WARNING,
+        if ( ! getJSName( name, sizeof(name) ) )
+        {
+            ulSetError ( UL_WARNING,
                    "JS: Failed to read joystick name from registry" ) ;
 
-      strncpy ( name, os->jsCaps.szPname, sizeof(name) ) ;
+            strncpy ( name, os->jsCaps.szPname, sizeof(name) ) ;
+        }
     }
 
     // Windows joystick drivers may provide any combination of
#END ==================================================================== 
#BEGIN pthreads 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\pthreads pthreads 
#DIFF ==================================================================== 
#END ==================================================================== 
#BEGIN Simgear 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source Simgear 
#DIFF ==================================================================== 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\magvar\coremag.cxx Simgear\simgear\magvar\coremag.cxx
--- C:\FGCVS\SimGear\source\simgear\magvar\coremag.cxx	Wed Sep 10 11:28:57 2008
+++ Simgear\simgear\magvar\coremag.cxx	Wed Nov 05 17:59:40 2008
@@ -74,12 +74,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
-<<<<<<< coremag.cxx
-// $Id: coremag.cxx,v 1.5 2006-10-28 22:12:48 curt Exp $
-=======
 // $Id: coremag.cxx,v 1.6 2008/07/25 18:35:42 ehofman Exp $
->>>>>>> 1.6
-
 
 #include <stdio.h>
 #include <stdlib.h>
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\nasal\gc.c Simgear\simgear\nasal\gc.c
--- C:\FGCVS\SimGear\source\simgear\nasal\gc.c	Sun Oct 05 13:00:46 2008
+++ Simgear\simgear\nasal\gc.c	Mon Nov 03 14:28:00 2008
@@ -16,9 +16,11 @@
 // Must be called with the giant exclusive lock!
 static void freeDead()
 {
+#ifdef NDEBUG   // problem with this in DEBUG configuration, so chop it!
     int i;
     for(i=0; i<globals->ndead; i++)
         naFree(globals->deadBlocks[i]);
+#endif // NDEBUG
     globals->ndead = 0;
 }
 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\nasal\hash.c Simgear\simgear\nasal\hash.c
--- C:\FGCVS\SimGear\source\simgear\nasal\hash.c	Sun Oct 05 13:00:46 2008
+++ Simgear\simgear\nasal\hash.c	Mon Nov 03 14:32:10 2008
@@ -219,7 +219,9 @@
 
 void naiGCHashClean(struct naHash* h)
 {
+#ifdef NDEBUG   // problem with this in Debug, so chop it!
     naFree(h->rec);
+#endif // only in Release
     h->rec = 0;
 }
 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\scene\model\ModelRegistry.cxx Simgear\simgear\scene\model\ModelRegistry.cxx
--- C:\FGCVS\SimGear\source\simgear\scene\model\ModelRegistry.cxx	Wed Sep 10 11:29:00 2008
+++ Simgear\simgear\scene\model\ModelRegistry.cxx	Sat Nov 01 19:45:50 2008
@@ -345,7 +345,12 @@
         Registry* registry = Registry::instance();
         ReaderWriter::ReadResult res;
         res = registry->readImageImplementation(absFileName, opt);
-        if (res.loadedFromCache())
+        if (res.error())
+        {
+            SG_LOG(SG_IO, SG_ALERT, "readImageImplementation FAILED on image file \""
+                   << fileName << "\" error=" << res.message() );
+            return ReaderWriter::ReadResult::FILE_NOT_FOUND;
+        } else if (res.loadedFromCache())
             SG_LOG(SG_IO, SG_INFO, "Returning cached image \""
                    << res.getImage()->getFileName() << "\"");
         else
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\sound\sample_openal.cxx Simgear\simgear\sound\sample_openal.cxx
--- C:\FGCVS\SimGear\source\simgear\sound\sample_openal.cxx	Fri Oct 31 15:14:15 2008
+++ Simgear\simgear\sound\sample_openal.cxx	Sun Nov 02 16:06:40 2008
@@ -30,7 +30,11 @@
 # include <OpenAL/al.h>
 # include <OpenAL/alut.h>
 #else
+#ifdef USE_OPENAL_SDK
+# include <al.h>
+#else
 # include <AL/al.h>
+#endif
 # include <AL/alut.h>
 #endif
 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\sound\sample_openal.hxx Simgear\simgear\sound\sample_openal.hxx
--- C:\FGCVS\SimGear\source\simgear\sound\sample_openal.hxx	Fri Oct 31 15:14:15 2008
+++ Simgear\simgear\sound\sample_openal.hxx	Sun Nov 02 16:06:38 2008
@@ -48,8 +48,12 @@
 # include <OpenAL/al.h>
 # include <OpenAL/alut.h>
 #else
+#ifdef USE_OPENAL_SDK
+# include <al.h>
+#else
 # include <AL/al.h>
 # include <AL/alut.h>
+#endif
 #endif
 
 #ifndef HAVE_WINDOWS_H
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.cxx Simgear\simgear\sound\soundmgr_openal.cxx
--- C:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.cxx	Wed Sep 10 11:29:08 2008
+++ Simgear\simgear\sound\soundmgr_openal.cxx	Wed Nov 05 16:48:10 2008
@@ -33,9 +33,14 @@
 # include <OpenAL/al.h>
 # include <OpenAL/alc.h>
 #else
+#ifdef USE_OPENAL_SDK
+# include <al.h>
+# include <AL/alut.h>
+#else
 # include <AL/al.h>
 # include <AL/alc.h>
 #endif
+#endif
 
 #if defined (__APPLE__)
 #  ifdef __GNUC__
@@ -104,6 +109,9 @@
         context = alcGetCurrentContext();
     }
 #else
+#ifdef _MSC_VER
+#pragma message("WARNING: ALUT_API_MAJOR_VERSION NOT SET! Has alut.h been included?")
+#endif // _MSC_VER
     if ( (dev = alcOpenDevice( NULL )) != NULL
             && ( context = alcCreateContext( dev, NULL )) != NULL ) {
         working = true;
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.hxx Simgear\simgear\sound\soundmgr_openal.hxx
--- C:\FGCVS\SimGear\source\simgear\sound\soundmgr_openal.hxx	Fri Oct 31 15:14:15 2008
+++ Simgear\simgear\sound\soundmgr_openal.hxx	Sun Nov 02 16:06:38 2008
@@ -46,8 +46,13 @@
 # include <OpenAL/al.h>
 # include <OpenAL/alc.h>
 #else
+#ifdef USE_OPENAL_SDK
+# include <al.h>
+# include <alc.h>
+#else
 # include <AL/al.h>
 # include <AL/alc.h>
+#endif
 #endif
 
 #include "sample_openal.hxx"
#END ==================================================================== 
#BEGIN alut 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\freealut-1.1.0-src alut 
#DIFF ==================================================================== 
#END ==================================================================== 
#BEGIN lpng 
diff -ur -x *.dsp -x *.vcproj -x *.obj -x *.lib C:\FGCVS\lpng1232 lpng 
#DIFF ==================================================================== 
#END ==================================================================== 
