Updated build system to remove DEFS += -DFOO type lines. This doesn't seem
to be supported in recent versions of autoconf.
This commit is contained in:
curt
parent
540849b9c3
commit
aea253a85c
9 changed files with 30 additions and 56 deletions
3
Thanks
3
Thanks
|
|
@ -120,8 +120,9 @@ Bruce Jackson of NASA <e.b.jackson@larc.nasa.gov>
|
|||
flight model. Bruce has patiently answered my many, many questions.
|
||||
|
||||
|
||||
Oliver L. K. <delise@rp-plus.de>
|
||||
Oliver Delise <delise@rp-plus.de>
|
||||
FAQ Maintainer.
|
||||
Working on adding some networking / multi-user support.
|
||||
|
||||
|
||||
Tom Knienieder <knienieder@ms.netwing.at>
|
||||
|
|
|
|||
23
acconfig.h
23
acconfig.h
|
|
@ -45,6 +45,15 @@
|
|||
/* Define if you have <dirent.h>. */
|
||||
#undef DIRENT
|
||||
|
||||
/* Define to enable audio support */
|
||||
#undef ENABLE_AUDIO_SUPPORT
|
||||
|
||||
/* Define to enable GLUT joystick support (limited to 3 axes) */
|
||||
#undef ENABLE_GLUT_JOYSTICK
|
||||
|
||||
/* Define to enable plib joystick support (recommended) */
|
||||
#undef ENABLE_PLIB_JOYSTICK
|
||||
|
||||
/* Define to eliminate all trace of debugging messages such as for a
|
||||
release build */
|
||||
#undef FG_NDEBUG
|
||||
|
|
@ -52,6 +61,14 @@
|
|||
/* Define to include Oliver's networking support */
|
||||
#undef FG_NETWORK_OLK
|
||||
|
||||
/* Define if we are building FGFS (should always be defined) */
|
||||
#undef FGFS
|
||||
|
||||
/* Define to enable 3dfx/glide render in a window hack under unix.
|
||||
This probably won't work under windows. */
|
||||
#undef XMESA
|
||||
#undef FX
|
||||
|
||||
/* Define to the type of elements in the array set by `getgroups'.
|
||||
Usually this is either `int' or `gid_t'. */
|
||||
#undef GETGROUPS_T
|
||||
|
|
@ -71,6 +88,9 @@
|
|||
/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
|
||||
#undef HAVE_ALLOCA_H
|
||||
|
||||
/* Define if you external variables daylight. */
|
||||
#undef HAVE_DAYLIGHT
|
||||
|
||||
/* Define if you don't have vprintf but do have _doprnt. */
|
||||
#undef HAVE_DOPRNT
|
||||
|
||||
|
|
@ -127,6 +147,9 @@
|
|||
/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
|
||||
#undef HAVE_SYS_WAIT_H
|
||||
|
||||
/* Define if you external variables timezone. */
|
||||
#undef HAVE_TIMEZONE
|
||||
|
||||
/* Define if your struct tm has tm_zone. */
|
||||
#undef HAVE_TM_ZONE
|
||||
|
||||
|
|
|
|||
|
|
@ -25,4 +25,4 @@ testJSBsim_LDADD = libJSBsim.a
|
|||
|
||||
INCLUDES += -I$(top_builddir)
|
||||
|
||||
DEFS += -DFGFS
|
||||
# DEFS += -DFGFS
|
||||
|
|
|
|||
|
|
@ -7,5 +7,3 @@ libFlight_a_SOURCES = flight.cxx flight.hxx \
|
|||
LaRCsim.cxx LaRCsim.hxx
|
||||
|
||||
INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator
|
||||
|
||||
DEFS += -DFGFS
|
||||
|
|
|
|||
|
|
@ -1,7 +1,3 @@
|
|||
if ENABLE_XMESA_FX
|
||||
DEFS += -DXMESA -DFX
|
||||
endif
|
||||
|
||||
noinst_LIBRARIES = libGUI.a
|
||||
|
||||
libGUI_a_SOURCES = gui.cxx gui.h
|
||||
|
|
|
|||
|
|
@ -1,9 +1,3 @@
|
|||
if ENABLE_PLIB_JOYSTICK
|
||||
DEFS += -DENABLE_PLIB_JOYSTICK
|
||||
else
|
||||
DEFS += -DENABLE_GLUT_JOYSTICK
|
||||
endif
|
||||
|
||||
noinst_LIBRARIES = libJoystick.a
|
||||
|
||||
libJoystick_a_SOURCES = joystick.cxx joystick.hxx
|
||||
|
|
|
|||
|
|
@ -1,33 +1,10 @@
|
|||
if ENABLE_AUDIO_SUPPORT
|
||||
DEFS += -DENABLE_AUDIO_SUPPORT
|
||||
AUDIO_LIBS = -lsl -lsm
|
||||
endif
|
||||
|
||||
if ENABLE_IRIX_AUDIO
|
||||
LIBS += -laudio
|
||||
endif
|
||||
|
||||
if ENABLE_WIN32_AUDIO
|
||||
LIBS += -lwinmm
|
||||
endif
|
||||
|
||||
if ENABLE_PLIB_JOYSTICK
|
||||
DEFS += -DENABLE_PLIB_JOYSTICK
|
||||
else
|
||||
DEFS += -DENABLE_GLUT_JOYSTICK
|
||||
endif
|
||||
|
||||
if ENABLE_XMESA_FX
|
||||
DEFS += -DXMESA -DFX
|
||||
endif
|
||||
|
||||
if ENABLE_UNIX_SERIAL
|
||||
SERIAL_LIBS = $(top_builddir)/Lib/Serial/libSerial.a
|
||||
else
|
||||
SERIAL_LIBS =
|
||||
endif
|
||||
|
||||
DEFS += -DPKGLIBDIR=\"$(pkglibdir)\"
|
||||
CPPFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
|
||||
|
||||
EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
|
||||
|
||||
|
|
@ -63,7 +40,6 @@ fgfs_LDADD = \
|
|||
$(top_builddir)/Simulator/Time/libTime.a \
|
||||
$(top_builddir)/Simulator/Weather/libWeather.a \
|
||||
$(top_builddir)/Simulator/Joystick/libJoystick.a \
|
||||
$(AUDIO_LIBS) \
|
||||
$(SERIAL_LIBS) \
|
||||
$(top_builddir)/Lib/Math/libMath.a \
|
||||
$(top_builddir)/Lib/Bucket/libBucket.a \
|
||||
|
|
@ -71,7 +47,9 @@ fgfs_LDADD = \
|
|||
-lpu -lfnt -lssg -lsg \
|
||||
$(top_builddir)/Lib/Misc/libMisc.a \
|
||||
$(top_builddir)/Lib/zlib/libz.a \
|
||||
$(opengl_LIBS)
|
||||
$(opengl_LIBS) \
|
||||
$(audio_LIBS)
|
||||
|
||||
|
||||
INCLUDES += \
|
||||
-I$(top_builddir) \
|
||||
|
|
|
|||
|
|
@ -1,11 +1,3 @@
|
|||
if HAVE_DAYLIGHT
|
||||
DEFS += -DHAVE_DAYLIGHT
|
||||
endif
|
||||
|
||||
if HAVE_TIMEZONE
|
||||
DEFS += -DHAVE_TIMEZONE
|
||||
endif
|
||||
|
||||
noinst_LIBRARIES = libTime.a
|
||||
|
||||
libTime_a_SOURCES = \
|
||||
|
|
|
|||
|
|
@ -1,11 +1,3 @@
|
|||
if HAVE_DAYLIGHT
|
||||
DEFS += -DHAVE_DAYLIGHT
|
||||
endif
|
||||
|
||||
if HAVE_TIMEZONE
|
||||
DEFS += -DHAVE_TIMEZONE
|
||||
endif
|
||||
|
||||
bin_PROGRAMS = est-epsilon gl-info test-mktime
|
||||
|
||||
est_epsilon_SOURCES = est-epsilon.c
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue