Olaf Flebbe:
This patch makes FlightGear 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.
This commit is contained in:
parent
8e8b2bba04
commit
31621f50af
7 changed files with 11288 additions and 11257 deletions
2745
FlightGear.dsp
2745
FlightGear.dsp
File diff suppressed because it is too large
Load diff
16
am2dsp.cfg
16
am2dsp.cfg
|
@ -7,12 +7,17 @@ exclude_file = src\GUI\net_dlg.cxx
|
|||
exclude_file = src\GUI\net_dlg.hxx
|
||||
|
||||
include_path = ..
|
||||
include_path = .\src
|
||||
include_path = .\src\include
|
||||
include_path = src
|
||||
include_path = src\include
|
||||
include_path = src\FDM\JSBsim
|
||||
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 = ..\freeglut-2.4.0\include
|
||||
include_path = "..\OpenAL 1.0 Software Development Kit\include"
|
||||
include_path = ..\Pre-built.2\include
|
||||
|
||||
define = _USE_MATH_DEFINES
|
||||
define = _CRT_SECURE_NO_DEPRECATE
|
||||
define = HAVE_CONFIG_H
|
||||
define = FGFS
|
||||
#define = FG_NDEBUG
|
||||
|
@ -38,9 +43,6 @@ define = ENABLE_PLIB_JOYSTICK
|
|||
#lib_path = ..\SimGear
|
||||
#add_lib = SimGear
|
||||
|
||||
#lib_path = ..\SimGear\metakit\builds
|
||||
#add_lib = mk4vc60s_std_d
|
||||
|
||||
#add_project = ..\SimGear\SimGear.dsp
|
||||
|
||||
# Rule to create config.h
|
||||
|
|
|
@ -22,10 +22,6 @@
|
|||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# define _USE_MATH_DEFINES
|
||||
#endif
|
||||
//#include <math.h>
|
||||
#include <algorithm>
|
||||
|
||||
#include <simgear/compiler.h>
|
||||
|
|
|
@ -24,9 +24,6 @@
|
|||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# define _USE_MATH_DEFINES
|
||||
#endif
|
||||
#include <math.h>
|
||||
#include <algorithm>
|
||||
|
||||
|
|
|
@ -26,10 +26,6 @@
|
|||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# define _USE_MATH_DEFINES
|
||||
#endif
|
||||
//#include <math.h>
|
||||
//#include <algorithm>
|
||||
|
||||
#include <simgear/compiler.h>
|
||||
|
|
|
@ -28,9 +28,6 @@
|
|||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# define _USE_MATH_DEFINES
|
||||
#endif
|
||||
#include <math.h>
|
||||
#include <algorithm>
|
||||
|
||||
|
|
Loading…
Reference in a new issue