747bc7c6b4
- The new classes in libmisc.tgz define a stream interface into zlib.
I've put these in a new directory, Lib/Misc. Feel free to rename it
to something more appropriate. However you'll have to change the
include directives in all the other files. Additionally you'll have
add the library to Lib/Makefile.am and Simulator/Main/Makefile.am.
The StopWatch class in Lib/Misc requires a HAVE_GETRUSAGE autoconf
test so I've included the required changes in config.tgz.
There are a fair few changes to Simulator/Objects as I've moved
things around. Loading tiles is quicker but thats not where the delay
is. Tile loading takes a few tenths of a second per file on a P200
but it seems to be the post-processing that leads to a noticeable
blip in framerate. I suppose its time to start profiling to see where
the delays are.
I've included a brief description of each archives contents.
Lib/Misc/
zfstream.cxx
zfstream.hxx
C++ stream interface into zlib.
Taken from zlib-1.1.3/contrib/iostream/.
Minor mods for STL compatibility.
There's no copyright associated with these so I assume they're
covered by zlib's.
fgstream.cxx
fgstream.hxx
FlightGear input stream using gz_ifstream. Tries to open the
given filename. If that fails then filename is examined and a
".gz" suffix is removed or appended and that file is opened.
stopwatch.hxx
A simple timer for benchmarking. Not used in production code.
Taken from the Blitz++ project. Covered by GPL.
strutils.cxx
strutils.hxx
Some simple string manipulation routines.
Simulator/Airports/
Load airports database using fgstream.
Changed fgAIRPORTS to use set<> instead of map<>.
Added bool fgAIRPORTS::search() as a neater way doing the lookup.
Returns true if found.
Simulator/Astro/
Modified fgStarsInit() to load stars database using fgstream.
Simulator/Objects/
Modified fgObjLoad() to use fgstream.
Modified fgMATERIAL_MGR::load_lib() to use fgstream.
Many changes to fgMATERIAL.
Some changes to fgFRAGMENT but I forget what!
61 lines
1.6 KiB
Makefile
61 lines
1.6 KiB
Makefile
if ENABLE_AUDIO_SUPPORT
|
|
DEFS += -DENABLE_AUDIO_SUPPORT
|
|
AUDIO_LIBS = \
|
|
$(top_builddir)/Lib/Audio/src/libsl.a \
|
|
$(top_builddir)/Lib/Audio/src/libsm.a
|
|
endif
|
|
|
|
if ENABLE_IRIX_AUDIO
|
|
LIBS += -laudio
|
|
endif
|
|
|
|
if ENABLE_WIN32_AUDIO
|
|
LIBS += -lwinmm
|
|
endif
|
|
|
|
if ENABLE_XMESA_FX
|
|
DEFS += -DXMESA -DFX
|
|
endif
|
|
|
|
EXTRA_DIST = runfgfs.in runfgfs.bat.in
|
|
|
|
bin_PROGRAMS = fgfs
|
|
|
|
bin_SCRIPTS = runfgfs runfgfs.bat
|
|
|
|
fgfs_SOURCES = \
|
|
GLUTkey.cxx GLUTkey.hxx GLUTmain.cxx \
|
|
fg_config.h \
|
|
fg_init.cxx fg_init.hxx \
|
|
options.cxx options.hxx \
|
|
splash.cxx splash.hxx \
|
|
views.cxx views.hxx
|
|
|
|
fgfs_LDADD = \
|
|
$(top_builddir)/Simulator/Aircraft/libAircraft.a \
|
|
$(top_builddir)/Simulator/Airports/libAirports.a \
|
|
$(top_builddir)/Simulator/Astro/libAstro.a \
|
|
$(top_builddir)/Simulator/Autopilot/libAutopilot.a \
|
|
$(top_builddir)/Simulator/Cockpit/libCockpit.a \
|
|
$(top_builddir)/Simulator/Controls/libControls.a \
|
|
$(top_builddir)/Simulator/Flight/libFlight.a \
|
|
$(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.a \
|
|
$(top_builddir)/Simulator/Flight/Slew/libSlew.a \
|
|
$(top_builddir)/Simulator/GUI/libGUI.a \
|
|
$(top_builddir)/Simulator/Scenery/libScenery.a \
|
|
$(top_builddir)/Simulator/Objects/libObjects.a \
|
|
$(top_builddir)/Simulator/Time/libTime.a \
|
|
$(top_builddir)/Simulator/Weather/libWeather.a \
|
|
$(top_builddir)/Simulator/Joystick/libJoystick.a \
|
|
$(AUDIO_LIBS) \
|
|
$(top_builddir)/Lib/Math/libMath.a \
|
|
$(top_builddir)/Lib/Bucket/libBucket.a \
|
|
$(top_builddir)/Lib/Debug/libDebug.a \
|
|
$(top_builddir)/Lib/PUI/libPUI.a \
|
|
$(top_builddir)/Lib/zlib/libz.a \
|
|
$(top_builddir)/Lib/Misc/libMisc.a
|
|
|
|
INCLUDES += \
|
|
-I$(top_builddir) \
|
|
-I$(top_builddir)/Lib \
|
|
-I$(top_builddir)/Simulator
|