Misc. configure tweaks.
This commit is contained in:
parent
56dc95da55
commit
7c3d74cb79
3 changed files with 39 additions and 30 deletions
|
@ -35,8 +35,8 @@ For debuging purposes you might want to try something like:
|
||||||
For full optimization using the EGCS compiler on an Intel processor you
|
For full optimization using the EGCS compiler on an Intel processor you
|
||||||
could try something like:
|
could try something like:
|
||||||
|
|
||||||
MACH="-mpentiumpro"
|
MACH="-mpentium" (-m486 -mpentiumpro etc.)
|
||||||
CFLAGS = -O5 -fomit-frame-pointer -ffast-math -funroll-loops $MACH
|
export CFLAGS="-O5 -fomit-frame-pointer -ffast-math -funroll-loops $MACH"
|
||||||
CXXFLAGS = -O5 -fomit-frame-pointer -ffast-math -funroll-loops $MACH
|
export CXXFLAGS="-O5 -fomit-frame-pointer -ffast-math -funroll-loops $MACH"
|
||||||
./configure
|
./configure
|
||||||
|
|
||||||
|
|
26
aclocal.m4
vendored
26
aclocal.m4
vendored
|
@ -10,19 +10,6 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||||
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
dnl PARTICULAR PURPOSE.
|
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 --
|
# Do all the work for Automake. This macro actually does too much --
|
||||||
# some checks are only needed if your package does certain things.
|
# some checks are only needed if your package does certain things.
|
||||||
# But this isn't really a big deal.
|
# But this isn't really a big deal.
|
||||||
|
@ -124,6 +111,19 @@ else
|
||||||
fi
|
fi
|
||||||
AC_SUBST($1)])
|
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.
|
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
||||||
|
|
||||||
AC_DEFUN(AM_CONFIG_HEADER,
|
AC_DEFUN(AM_CONFIG_HEADER,
|
||||||
|
|
37
configure.in
37
configure.in
|
@ -5,20 +5,6 @@ dnl
|
||||||
|
|
||||||
AC_INIT(Simulator/Aircraft/aircraft.c)
|
AC_INIT(Simulator/Aircraft/aircraft.c)
|
||||||
|
|
||||||
dnl specify the compiled flight model
|
|
||||||
AC_ARG_WITH(flight-model, [ --with-flight-model=xxx Specify the 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(sgi-opengl, [ --with-sgi-opengl Build against SGI's opengl.dll glu.dll and glut.dll])
|
|
||||||
|
|
||||||
dnl Initialize the automake stuff
|
dnl Initialize the automake stuff
|
||||||
AM_INIT_AUTOMAKE(FlightGear, 0.53)
|
AM_INIT_AUTOMAKE(FlightGear, 0.53)
|
||||||
|
|
||||||
|
@ -42,6 +28,28 @@ dnl AC_ISC_POSIX
|
||||||
dnl Check to see if this `configure' is being run in the `Cygwin32' environment
|
dnl Check to see if this `configure' is being run in the `Cygwin32' environment
|
||||||
dnl AM_CYGWIN32
|
dnl AM_CYGWIN32
|
||||||
|
|
||||||
|
dnl specify if we are building with "checker"
|
||||||
|
AC_ARG_WITH(efence, [ --with-efence Specify if we are building with "electric-fence"])
|
||||||
|
|
||||||
|
if test "x$with_efence" = "xyes" ; then
|
||||||
|
echo "Building with efence"
|
||||||
|
LIBS= "$LIBS -lefence"
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl specify the compiled flight model
|
||||||
|
AC_ARG_WITH(flight-model, [ --with-flight-model=xxx Specify the 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(sgi-opengl, [ --with-sgi-opengl Build against SGI's opengl.dll glu.dll and glut.dll])
|
||||||
|
|
||||||
dnl Check for MS Windows environment
|
dnl Check for MS Windows environment
|
||||||
AC_CHECK_HEADER(windows.h)
|
AC_CHECK_HEADER(windows.h)
|
||||||
|
|
||||||
|
@ -233,6 +241,7 @@ AC_OUTPUT( \
|
||||||
Lib/Bucket/Makefile \
|
Lib/Bucket/Makefile \
|
||||||
Lib/Debug/Makefile \
|
Lib/Debug/Makefile \
|
||||||
Lib/DEM/Makefile \
|
Lib/DEM/Makefile \
|
||||||
|
Lib/gpc/Makefile \
|
||||||
Lib/Math/Makefile \
|
Lib/Math/Makefile \
|
||||||
Lib/PUI/Makefile \
|
Lib/PUI/Makefile \
|
||||||
Lib/XGL/Makefile \
|
Lib/XGL/Makefile \
|
||||||
|
|
Loading…
Reference in a new issue