From e9a532357c46a4b756643724bcffac24f168968b Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 12 Aug 1998 21:00:29 +0000 Subject: [PATCH] Added a --with-flight-model= option to the configure script. --- NEWS | 4 ++++ Thanks | 34 ++++++++++++++++++++-------------- aclocal.m4 | 26 +++++++++++++------------- configure.in | 10 ++++++++++ 4 files changed, 47 insertions(+), 27 deletions(-) diff --git a/NEWS b/NEWS index 04263128f..6d75b6bde 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,8 @@ New in 0.52 +* Stars added in 8 stages as sky gets darker for a smoother more realistic + transition. +* rewrote star loader to significantly improve load times. +* Tweaked sky brightness and dawn/dusk colors. * Fixed a small problem with moon rendering. * Fog color tries to track the sky color at the center of view in sunrise and sunset situations. diff --git a/Thanks b/Thanks index 5ba36e473..41bdc92f5 100644 --- a/Thanks +++ b/Thanks @@ -111,20 +111,6 @@ Alan Murta Created the Generic Polygon Clipping library -Jonathan R Shewchuk - Author of the Triangle program. Triangle is used to calculate the - Delauney triangulation of our irregular terrain. - - -Michael Smith - Contributed cockpit graphics, 3d models, logos, and other images. - Project Bonanza - http://members.xoom.com/ConceptSim/index.html - - -U.S. Geological Survey - http://edcwww.cr.usgs.gov/doc/edchome/ndcdb/ndcdb.html - Provided geographic data used by this project - - Friedemann Reinhard Contributed beginnings of a textured instrument panel. @@ -142,6 +128,26 @@ Chris Schoeneman will have an influence on the development of our own audio library. +Jonathan R Shewchuk + Author of the Triangle program. Triangle is used to calculate the + Delauney triangulation of our irregular terrain. + + +Gordan Sikic + Contributed a cherokee flight model for LaRCsim. Currently is not + working and needs to be debugged. Use configure --with-flight-model=cherokee + to build the cherokee instead of the navion. + + +Michael Smith + Contributed cockpit graphics, 3d models, logos, and other images. + Project Bonanza - http://members.xoom.com/ConceptSim/index.html + + +U.S. Geological Survey - http://edcwww.cr.usgs.gov/doc/edchome/ndcdb/ndcdb.html + Provided geographic data used by this project + + Durk Talsma Accurate Sun, Moon, and Planets. Sun changes color based on position in sky. Moon has correct phase and blends well into the diff --git a/aclocal.m4 b/aclocal.m4 index f57d6ff83..e7f3a5867 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -10,6 +10,19 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl PARTICULAR PURPOSE. +# Define a conditional. + +AC_DEFUN(AM_CONDITIONAL, +[AC_SUBST($1_TRUE) +AC_SUBST($1_FALSE) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi]) + # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. @@ -111,19 +124,6 @@ else fi AC_SUBST($1)]) -# Define a conditional. - -AC_DEFUN(AM_CONDITIONAL, -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) - # Like AC_CONFIG_HEADER, but automatically create stamp file. AC_DEFUN(AM_CONFIG_HEADER, diff --git a/configure.in b/configure.in index 483eeb063..265b64ba4 100644 --- a/configure.in +++ b/configure.in @@ -5,6 +5,16 @@ dnl AC_INIT(Simulator/Aircraft/aircraft.c) +dnl specify the compiled flight model +AC_ARG_WITH(flight-model, [ --with-flight-model Specify the compiled in flight model (navion, cherokee)]) + +if test "x$with_flight_model" = "xcherokee" ; then + echo "Building with cherokee flight model" +else + echo "Building with navion flight model" +fi +AM_CONDITIONAL(ENABLE_CHEROKEE, test "x$with_flight_model" = "xcherokee") + dnl Let the Win32 user specify if they want to build with the SGI dnl opengl.dll as opposed to the more standard openg32.dll AC_ARG_WITH(sgiopengl, [ --with-sgiopengl Build against opengl.dll glu.dll and glut.dll]) -- 2.39.5