diff --git a/configure.ac b/configure.ac index 1277dd1a3..18ecf3a51 100644 --- a/configure.ac +++ b/configure.ac @@ -473,7 +473,7 @@ dnl Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS( \ fcntl.h getopt.h malloc.h memory.h stdlib.h sys/param.h sys/stat.h \ - sys/time.h sys/timeb.h unistd.h windows.h values.h ) + sys/time.h sys/timeb.h unistd.h windows.h values.h ) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -487,7 +487,7 @@ LIBS="$base_LIBS $network_LIBS $opengl_LIBS" AC_TYPE_SIGNAL AC_FUNC_VPRINTF AC_CHECK_FUNCS( [ \ - ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \ + ftime gettimeofday timegm memcpy bcopy mktime strstr rand mkfifo \ random drand48 setitimer getitimer signal GetLocalTime rint getrusage \ truncf ] ) LIBS=$old_LIBS @@ -503,15 +503,16 @@ AC_CONFIG_FILES([ \ man/gl-info.1 \ man/js_demo.1 \ man/pstest.1 \ - scripts/Makefile \ - scripts/debug/Makefile \ - scripts/perl/Makefile \ - scripts/perl/examples/Makefile \ - scripts/python/Makefile \ + scripts/Makefile \ + scripts/debug/Makefile \ + scripts/perl/Makefile \ + scripts/perl/examples/Makefile \ + scripts/python/Makefile \ src/Makefile \ src/Include/Makefile \ src/Include/version.h \ src/Include/config.h-msvc6 \ + src/Include/config.h-msvc71 \ src/Include/config.h-msvc8 \ src/Aircraft/Makefile \ src/Airports/Makefile \ @@ -527,7 +528,7 @@ AC_CONFIG_FILES([ \ src/FDM/JSBSim/initialization/Makefile \ src/FDM/JSBSim/input_output/Makefile \ src/FDM/JSBSim/math/Makefile \ - src/FDM/JSBSim/models/Makefile \ + src/FDM/JSBSim/models/Makefile \ src/FDM/JSBSim/models/flight_control/Makefile \ src/FDM/JSBSim/models/atmosphere/Makefile \ src/FDM/JSBSim/models/propulsion/Makefile \ diff --git a/projects/VC7.1/3dconvert.vcproj b/projects/VC7.1/3dconvert.vcproj index ef10e23bf..bfed9b94a 100755 --- a/projects/VC7.1/3dconvert.vcproj +++ b/projects/VC7.1/3dconvert.vcproj @@ -20,7 +20,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\SimGear;..\..\.." - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -70,7 +70,7 @@ @@ -23,7 +24,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\..\SimGear;"..\..\..\pthreads-w32-2-7-0-release";..\..\src\FDM\JSBSim;..\..\..\OpenSceneGraph\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include" - PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;FG_PLIB_JOYSTICK_GETNAME;FG_NEW_ENVIRONMENT;FG_MPLAYER_AS;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER" + PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" StringPooling="TRUE" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -87,7 +88,7 @@ Name="VCCLCompilerTool" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\..;..\..\src;..\..\src\include;..\..\src\FDM\JSBSim;..\..\..\SimGear;"..\..\..\pthreads-w32-2-7-0-release";..\..\..\OpenSceneGraph\include;..\..\..\Producer\include;..\..\..\OpenThreads\include;..\..\..\3rdParty\include" - PreprocessorDefinitions="HAVE_CONFIG_H;FGFS;NDEBUG;WIN32;_CONSOLE;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;FG_PLIB_JOYSTICK_GETNAME;FG_NEW_ENVIRONMENT;ENABLE_THREADS=1;FG_MPLAYER_AS;FG_USE_CLOUDS_3D;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER" + PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HAVE_CONFIG_H;FGFS;ENABLE_AUDIO_SUPPORT;_FG_NDEBUG;ENABLE_THREADS=1;FG_ENABLE_MULTIPASS_CLOUDS;ENABLE_SP_FMDS;_USE_MATH_DEFINES;FG_JPEG_SERVER;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -2794,7 +2795,23 @@ + RelativePath="..\..\src\Include\config.h-msvc71"> + + + + + + diff --git a/projects/VC7.1/GPSsmooth.vcproj b/projects/VC7.1/GPSsmooth.vcproj index dfae7e56d..cc3287361 100755 --- a/projects/VC7.1/GPSsmooth.vcproj +++ b/projects/VC7.1/GPSsmooth.vcproj @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src;..\..\..;..\..\..\SimGear;..\..\..\OpenSceneGraph\include;..\..\..\3rdParty\include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -71,7 +71,7 @@ doesn't define. */ +/* #undef size_t */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you can safely include both and . */ +/* #undef TIME_WITH_SYS_TIME */ + +/* Define if your declares struct tm. */ +#define TM_IN_SYS_TIME 1 + +/* Define to version number */ +#define VERSION "0.9.10" +#ifndef FG_VERSION /* allow override */ +#define FG_VERSION 7 +#endif /* FG_VERSION */ + +/* Define if compiling on a Winbloze (95, NT, etc.) platform */ +#define WIN32 1 + +/* Define if you have the GetLocalTime function. */ +#define HAVE_GETLOCALTIME 1 + +/* Define if you have the ftime function. */ +#define HAVE_FTIME 1 + +/* Define if you have the getitimer function. */ +/* #define HAVE_GETITIMER 1 */ + +/* Define if you have the getrusage function. */ +/* #define HAVE_GETRUSAGE 1 */ + +/* Define if you have the gettimeofday function. */ +/* #define HAVE_GETTIMEOFDAY 1 */ + +/* Define if you have the mktime function. */ +#define HAVE_MKTIME 1 + +/* Define if you have the rand function. */ +#define HAVE_RAND 1 + +/* Define if you have the random function. */ +/* #define HAVE_RANDOM 1 */ + +/* Define if you have the rint function. */ +/* #define HAVE_RINT 1 */ + +/* Define if you have the setitimer function. */ +/* #define HAVE_SETITIMER 1 */ + +/* Define if you have the signal function. */ +#define HAVE_SIGNAL 1 + +/* Define if you have the strstr function. */ +#define HAVE_STRSTR 1 + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define if you have the header file. */ +#define HAVE_MALLOC_H 1 + +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_SYS_TIME_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_UNISTD_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_VALUES_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_WINBASE_H 1 + +/* Define if you have the header file. */ +#define HAVE_WINDOWS_H 1 + +/* Define if you have the GL library (-lGL). */ +#define HAVE_LIBGL 1 + +/* Define if you have the GLU library (-lGLU). */ +#define HAVE_LIBGLU 1 + +/* Define if you have the GLcore library (-lGLcore). */ +/* #undef HAVE_LIBGLCORE */ + +/* Define if you have the ICE library (-lICE). */ +/* #define HAVE_LIBICE 1 */ + +/* Define if you have the MesaGL library (-lMesaGL). */ +/* #undef HAVE_LIBMESAGL */ + +/* Define if you have the MesaGLU library (-lMesaGLU). */ +/* #undef HAVE_LIBMESAGLU */ + +/* Define if you have the SM library (-lSM). */ +/* #define HAVE_LIBSM 1 */ + +/* Define if you have the X11 library (-lX11). */ +/* #define HAVE_LIBX11 1 */ + +/* Define if you have the Xext library (-lXext). */ +/* #define HAVE_LIBXEXT 1 */ + +/* Define if you have the Xi library (-lXi). */ +/* #define HAVE_LIBXI 1 */ + +/* Define if you have the Xmu library (-lXmu). */ +/* #define HAVE_LIBXMU 1 */ + +/* Define if you have the Xt library (-lXt). */ +/* #define HAVE_LIBXT 1 */ + +/* Define if you have the glut library (-lglut). */ +#define HAVE_LIBGLUT 1 + +/* Define if you have the m library (-lm). */ +#define HAVE_LIBM 1 + +/* Define if you have the socket library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* Define if you have the header file. */ +#define HAVE_MEMORY_H 1 + +#define HAVE_MEMCPY 1 + +#define NOMINMAX 1 + +#ifndef ENABLE_AUDIO_SUPPORT +#define ENABLE_AUDIO_SUPPORT +#endif + +#define FG_GLUT_H + +// eof - config.h-msvc71 - single flightgear config.h file diff --git a/src/Include/config.h-msvc71.in b/src/Include/config.h-msvc71.in new file mode 100755 index 000000000..d67dcacbb --- /dev/null +++ b/src/Include/config.h-msvc71.in @@ -0,0 +1,172 @@ +/* Special single config.h for MSVC71 build - F. Bouvier - 06 Jan, 2007 */ + +/* Define if the X Window System is missing or not being used. */ +#define X_DISPLAY_MISSING 1 + +/* Define if the CONSOLE output has no ANSI driver (eg no "esc [ ..." seqs.) */ +#define NO_ANSI_DRIVER + +/* Define to empty if the keyword does not work. */ +/* #undef const */ + +/* Define if you don't have vprintf but do have _doprnt. */ +/* #undef HAVE_DOPRNT */ + +/* Define if you have the vprintf function. */ +#define HAVE_VPRINTF 1 + +/* Define to package name - not used? */ +#define PACKAGE "FlightGear" + +/* Define to package version - use in main.cxx */ +#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-@VERSION@" + +/* Define as the return type of signal handlers (int or void). */ +#define RETSIGTYPE void + +/* Define to `unsigned' if doesn't define. */ +/* #undef size_t */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you can safely include both and . */ +/* #undef TIME_WITH_SYS_TIME */ + +/* Define if your declares struct tm. */ +#define TM_IN_SYS_TIME 1 + +/* Define to version number */ +#define VERSION "@VERSION@" +#ifndef FG_VERSION /* allow override */ +#define FG_VERSION 7 +#endif /* FG_VERSION */ + +/* Define if compiling on a Winbloze (95, NT, etc.) platform */ +#define WIN32 1 + +/* Define if you have the GetLocalTime function. */ +#define HAVE_GETLOCALTIME 1 + +/* Define if you have the ftime function. */ +#define HAVE_FTIME 1 + +/* Define if you have the getitimer function. */ +/* #define HAVE_GETITIMER 1 */ + +/* Define if you have the getrusage function. */ +/* #define HAVE_GETRUSAGE 1 */ + +/* Define if you have the gettimeofday function. */ +/* #define HAVE_GETTIMEOFDAY 1 */ + +/* Define if you have the mktime function. */ +#define HAVE_MKTIME 1 + +/* Define if you have the rand function. */ +#define HAVE_RAND 1 + +/* Define if you have the random function. */ +/* #define HAVE_RANDOM 1 */ + +/* Define if you have the rint function. */ +/* #define HAVE_RINT 1 */ + +/* Define if you have the setitimer function. */ +/* #define HAVE_SETITIMER 1 */ + +/* Define if you have the signal function. */ +#define HAVE_SIGNAL 1 + +/* Define if you have the strstr function. */ +#define HAVE_STRSTR 1 + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define if you have the header file. */ +#define HAVE_MALLOC_H 1 + +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_SYS_TIME_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_UNISTD_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_VALUES_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_WINBASE_H 1 + +/* Define if you have the header file. */ +#define HAVE_WINDOWS_H 1 + +/* Define if you have the GL library (-lGL). */ +#define HAVE_LIBGL 1 + +/* Define if you have the GLU library (-lGLU). */ +#define HAVE_LIBGLU 1 + +/* Define if you have the GLcore library (-lGLcore). */ +/* #undef HAVE_LIBGLCORE */ + +/* Define if you have the ICE library (-lICE). */ +/* #define HAVE_LIBICE 1 */ + +/* Define if you have the MesaGL library (-lMesaGL). */ +/* #undef HAVE_LIBMESAGL */ + +/* Define if you have the MesaGLU library (-lMesaGLU). */ +/* #undef HAVE_LIBMESAGLU */ + +/* Define if you have the SM library (-lSM). */ +/* #define HAVE_LIBSM 1 */ + +/* Define if you have the X11 library (-lX11). */ +/* #define HAVE_LIBX11 1 */ + +/* Define if you have the Xext library (-lXext). */ +/* #define HAVE_LIBXEXT 1 */ + +/* Define if you have the Xi library (-lXi). */ +/* #define HAVE_LIBXI 1 */ + +/* Define if you have the Xmu library (-lXmu). */ +/* #define HAVE_LIBXMU 1 */ + +/* Define if you have the Xt library (-lXt). */ +/* #define HAVE_LIBXT 1 */ + +/* Define if you have the glut library (-lglut). */ +#define HAVE_LIBGLUT 1 + +/* Define if you have the m library (-lm). */ +#define HAVE_LIBM 1 + +/* Define if you have the socket library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* Define if you have the header file. */ +#define HAVE_MEMORY_H 1 + +#define HAVE_MEMCPY 1 + +#define NOMINMAX 1 + +#ifndef ENABLE_AUDIO_SUPPORT +#define ENABLE_AUDIO_SUPPORT +#endif + +#define FG_GLUT_H + +// eof - config.h-msvc71 - single flightgear config.h file