From: Torsten Dreyer Date: Sat, 26 Jun 2010 18:52:29 +0000 (+0200) Subject: config.h-msvc* restoration X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f7d0a7bd393e0a1f06d1d17728fb480fc1b36cd5;p=flightgear.git config.h-msvc* restoration As sugested by Frederic, remove the .in files and their reference in configure.ac, and remove the target files from .gitignore --- diff --git a/configure.ac b/configure.ac index 1e6eb40a7..5e49870fc 100644 --- a/configure.ac +++ b/configure.ac @@ -813,10 +813,6 @@ AC_CONFIG_FILES([ \ 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/Include/config.h-msvc90 \ src/Aircraft/Makefile \ src/Airports/Makefile \ src/ATC/Makefile \ diff --git a/src/Include/.gitignore b/src/Include/.gitignore index b173a70bf..e76f66334 100644 --- a/src/Include/.gitignore +++ b/src/Include/.gitignore @@ -1,8 +1,4 @@ config.h config.h.* -config.h-msvc6 -config.h-msvc71 -config.h-msvc8 -config.h-msvc90 stamp-h1 version.h diff --git a/src/Include/config.h-msvc6 b/src/Include/config.h-msvc6 new file mode 100644 index 000000000..1b7f8ddc6 --- /dev/null +++ b/src/Include/config.h-msvc6 @@ -0,0 +1,198 @@ + +/* Special single config.h for MSVC6 build - Geoff McLane - 23 July, 2003 */ + +/* Define to enable plib joystick support */ +#ifndef ENABLE_PLIB_JOYSTICK +#define ENABLE_PLIB_JOYSTICK +#endif // #ifndef ENABLE_PLIB_JOYSTICK + +/* Define to enable threaded tile paging */ +#undef ENABLE_THREADS + +/* Define so that JSBSim compiles in 'library' mode */ +#define FGFS 1 + +/* Define to build with jpeg screen shot server */ +#undef FG_JPEG_SERVER + +/* Define for no logging output */ +#undef FG_NDEBUG + +/* Define to build with Oliver's networking */ +#undef FG_NETWORK_OLK + +/* Define to enable plib joystick name support */ +#define FG_PLIB_JOYSTICK_GETNAME + +/* Define to build with Christian Mayer's weather code */ +#undef FG_WEATHERCM + +/* 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 "MSVC6-WIN32-2.0.0" + +/* 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 "2.0.0" + +/* 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 + +#ifndef FG_GLUT_H +#define FG_GLUT_H +#endif // #ifndef FG_GLUT_H + +// eof - config.h-msvc6 - single flightgear config.h file diff --git a/src/Include/config.h-msvc6.in b/src/Include/config.h-msvc6.in deleted file mode 100644 index 4ddcd9193..000000000 --- a/src/Include/config.h-msvc6.in +++ /dev/null @@ -1,198 +0,0 @@ - -/* Special single config.h for MSVC6 build - Geoff McLane - 23 July, 2003 */ - -/* Define to enable plib joystick support */ -#ifndef ENABLE_PLIB_JOYSTICK -#define ENABLE_PLIB_JOYSTICK -#endif // #ifndef ENABLE_PLIB_JOYSTICK - -/* Define to enable threaded tile paging */ -#undef ENABLE_THREADS - -/* Define so that JSBSim compiles in 'library' mode */ -#define FGFS 1 - -/* Define to build with jpeg screen shot server */ -#undef FG_JPEG_SERVER - -/* Define for no logging output */ -#undef FG_NDEBUG - -/* Define to build with Oliver's networking */ -#undef FG_NETWORK_OLK - -/* Define to enable plib joystick name support */ -#define FG_PLIB_JOYSTICK_GETNAME - -/* Define to build with Christian Mayer's weather code */ -#undef FG_WEATHERCM - -/* 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 "MSVC6-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@" - -/* 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 - -#ifndef FG_GLUT_H -#define FG_GLUT_H -#endif // #ifndef FG_GLUT_H - -// eof - config.h-msvc6 - single flightgear config.h file diff --git a/src/Include/config.h-msvc71 b/src/Include/config.h-msvc71 new file mode 100644 index 000000000..0e7fc3835 --- /dev/null +++ b/src/Include/config.h-msvc71 @@ -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-2.0.0" + +/* 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 "2.0.0" +#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 deleted file mode 100755 index d67dcacbb..000000000 --- a/src/Include/config.h-msvc71.in +++ /dev/null @@ -1,172 +0,0 @@ -/* 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 diff --git a/src/Include/config.h-msvc8 b/src/Include/config.h-msvc8 new file mode 100644 index 000000000..fd8ce66b9 --- /dev/null +++ b/src/Include/config.h-msvc8 @@ -0,0 +1,202 @@ + +/* Special single config.h for MSVC6 build - Geoff McLane - 23 July, 2003 */ + +/* Define to enable plib joystick support */ +#ifndef ENABLE_PLIB_JOYSTICK +#define ENABLE_PLIB_JOYSTICK +#endif // #ifndef ENABLE_PLIB_JOYSTICK + +/* Define to enable threaded tile paging */ +#define ENABLE_THREADS 1 +#define ENABLE_AUDIO_SUPPORT 1 + +/* Define so that JSBSim compiles in 'library' mode */ +#define FGFS 1 + +/* Define to build with jpeg screen shot server */ +#undef FG_JPEG_SERVER + +/* Define to build with multiplayer support */ +#define FG_MPLAYER_AS 1 + +/* Define for no logging output */ +#undef FG_NDEBUG + +/* Define to build with Oliver's networking */ +#undef FG_NETWORK_OLK + +/* Define to enable plib joystick name support */ +#define FG_PLIB_JOYSTICK_GETNAME + +/* Define to build with Christian Mayer's weather code */ +#undef FG_WEATHERCM + +/* 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 "MSVC8-WIN32-2.0.0" + +/* 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 "2.0.0" + +/* 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 + +#ifndef FG_GLUT_H +#define FG_GLUT_H +#endif // #ifndef FG_GLUT_H + +// eof - config.h-msvc6 - single flightgear config.h file diff --git a/src/Include/config.h-msvc8.in b/src/Include/config.h-msvc8.in deleted file mode 100644 index cc630a070..000000000 --- a/src/Include/config.h-msvc8.in +++ /dev/null @@ -1,202 +0,0 @@ - -/* Special single config.h for MSVC6 build - Geoff McLane - 23 July, 2003 */ - -/* Define to enable plib joystick support */ -#ifndef ENABLE_PLIB_JOYSTICK -#define ENABLE_PLIB_JOYSTICK -#endif // #ifndef ENABLE_PLIB_JOYSTICK - -/* Define to enable threaded tile paging */ -#define ENABLE_THREADS 1 -#define ENABLE_AUDIO_SUPPORT 1 - -/* Define so that JSBSim compiles in 'library' mode */ -#define FGFS 1 - -/* Define to build with jpeg screen shot server */ -#undef FG_JPEG_SERVER - -/* Define to build with multiplayer support */ -#define FG_MPLAYER_AS 1 - -/* Define for no logging output */ -#undef FG_NDEBUG - -/* Define to build with Oliver's networking */ -#undef FG_NETWORK_OLK - -/* Define to enable plib joystick name support */ -#define FG_PLIB_JOYSTICK_GETNAME - -/* Define to build with Christian Mayer's weather code */ -#undef FG_WEATHERCM - -/* 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 "MSVC8-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@" - -/* 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 - -#ifndef FG_GLUT_H -#define FG_GLUT_H -#endif // #ifndef FG_GLUT_H - -// eof - config.h-msvc6 - single flightgear config.h file diff --git a/src/Include/config.h-msvc90 b/src/Include/config.h-msvc90 new file mode 100644 index 000000000..e2c38e1eb --- /dev/null +++ b/src/Include/config.h-msvc90 @@ -0,0 +1,174 @@ +/* Special single config.h for MSVC90 build - F. Bouvier - 17 Jan, 2010 */ + +/* 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 "MSVC9.0-WIN32-2.0.0" + +/* 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 "2.0.0" +#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 + +#define HAVE_CULLSETTINGS_CLEAR_MASK 1 + +#ifndef ENABLE_AUDIO_SUPPORT +#define ENABLE_AUDIO_SUPPORT +#endif + +#define FG_GLUT_H + +// eof - config.h-msvc90 - single flightgear config.h file diff --git a/src/Include/config.h-msvc90.in b/src/Include/config.h-msvc90.in deleted file mode 100644 index 52695b032..000000000 --- a/src/Include/config.h-msvc90.in +++ /dev/null @@ -1,174 +0,0 @@ -/* Special single config.h for MSVC90 build - F. Bouvier - 17 Jan, 2010 */ - -/* 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 "MSVC9.0-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 - -#define HAVE_CULLSETTINGS_CLEAR_MASK 1 - -#ifndef ENABLE_AUDIO_SUPPORT -#define ENABLE_AUDIO_SUPPORT -#endif - -#define FG_GLUT_H - -// eof - config.h-msvc90 - single flightgear config.h file