Olaf Flebbe:

This patch makesFlightGear at least compile on MSVC. I hope I have removed
reference of my other local changes. DSP and DSW files are included for
reference. They have been reconstructed with am2dsp.pl. I had to introduce a
change to am2dsp because of the need of filenames with embedded spaces. (Yuck)

The major direction is to remove clutter like the _USE_MATH_DEFINES and
have it on the compiler command line sice there is no central include
file. You will have to put it on the command line for your locale
Project files, if it not there, already. I added the
_CRT_SECURE_NO_DEPRECATE define for 2005, since it does no harm to other
VC version.

Third Party Libs like plib, OpenALSDK, freeglut, pthreads-win32, zlib
are unpacked as is side by side. Only change put the includes of OpenAL
into include/AL rather directly into include.

SimGear.dsp

@@ -35,7 +35,7 @@ RSC=rc.exe
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /FD /c  /MT /I "." /I ".." /I ".\SimGear" /I ".\SimGear\metakit-2.4.3\include" /I "..\SimGear\zlib-1.1.4" /D "HAVE_CONFIG_H"
+# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /FD /c  /MT /I "." /I ".." /I ".\SimGear" /I "..\zlib-1.2.3" /I "..\OpenAL 1.0 Software Development Kit\include" /D "_USE_MATH_DEFINES" /D "_CRT_SECURE_NO_DEPRECATE" /D "HAVE_CONFIG_H"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
@@ -51,7 +51,7 @@ LINK32=link.exe -lib
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
-# ADD CPP /nologo /W3 /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /FR /FD /GZ /c  /MT /I "." /I ".." /I ".\SimGear" /I ".\SimGear\metakit-2.4.3\include" /I "..\SimGear\zlib-1.1.4" /D "HAVE_CONFIG_H"
+# ADD CPP /nologo /W3 /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /FR /FD /GZ /c  /MT /I "." /I ".." /I ".\SimGear" /I "..\zlib-1.2.3" /I "..\OpenAL 1.0 Software Development Kit\include" /D "_USE_MATH_DEFINES" /D "_CRT_SECURE_NO_DEPRECATE" /D "HAVE_CONFIG_H"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
@@ -568,6 +568,21 @@ SOURCE=.\simgear\math\fastmath.cxx
 
 !ENDIF 
 
+# End Source File
+# Begin Source File
+
+SOURCE=.\simgear\math\SGGeodesy.cxx
+
+!IF  "$(CFG)" == "SimGear - Win32 Release"
+
+# PROP Intermediate_Dir "Release\Lib_sgmath"
+
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\Lib_sgmath"
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Lib_sgenvironment"

SimGear.dsw

@@ -15,30 +15,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mklib"=".\SimGear\metakit-2.4.3\win\msvc60\mklib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "zlib"=".\SimGear\zlib.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Global:
 
 Package=<5>

am2dsp.cfg

@@ -4,14 +4,13 @@ exclude_dir = threads
 include_path = .
 include_path = ..
 include_path = .\SimGear
-include_path = .\SimGear\metakit-2.4.3\include
-include_path = ..\SimGear\zlib-1.1.4
+include_path = ..\zlib-1.2.3
+include_path = "..\OpenAL 1.0 Software Development Kit\include"
 
+define = _USE_MATH_DEFINES
+define = _CRT_SECURE_NO_DEPRECATE
 define = HAVE_CONFIG_H
 
-add_project = .\SimGear\metakit-2.4.3\win\msvc60\mklib.dsp,mklib
-add_project = .\SimGear\zlib.dsp,zlib
-
 # Rule to create simgear_config.h
 add_source_file = SOURCE=.\simgear\simgear_config.h.vc5\
 \

simgear/constants.h

@@ -32,9 +32,6 @@
 
 #include <simgear/compiler.h>
 
-#ifdef _MSC_VER
-#  define  _USE_MATH_DEFINES
-#endif
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
 #else

simgear/math/fastmath.hxx

@@ -25,9 +25,6 @@
 # error This library requires C++
 #endif
 
-#ifdef _MSC_VER
-#define  _USE_MATH_DEFINES
-#endif
 #include <math.h>
 
 

simgear/nasal/mathlib.c

@@ -1,6 +1,3 @@
-#ifdef _MSC_VER
-#define _USE_MATH_DEFINES
-#endif
 
 #include <math.h>
 #include <string.h>