fly/flightgear
1
0
Fork 0
Code Activity
flightgear/src/Main/Makefile.am

82 lines
2.3 KiB
Text
Raw Normal View History

Removed configuration option --with-old-mouse and FG_OLD_MOUSE macro. Removed configuration option --with-new-environment and FG_NEW_ENVIRONMENT macro. Added configuration option --with-weathercm and FG_WEATHERCM macro. FGEnvironment is now the default; use --with-weathercm to get the old weather.
2002-05-12 00:12:19 +00:00
if ENABLE_WEATHERCM
Code reorganization.
2000-02-15 03:30:01 +00:00
WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
Removed configuration option --with-old-mouse and FG_OLD_MOUSE macro. Removed configuration option --with-new-environment and FG_NEW_ENVIRONMENT macro. Added configuration option --with-weathercm and FG_WEATHERCM macro. FGEnvironment is now the default; use --with-weathercm to get the old weather.
2002-05-12 00:12:19 +00:00
else
WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
Moved Oliver's network stuff to his own subdir: NetworkOLK.
2000-01-12 18:09:35 +00:00
endif
if ENABLE_NETWORK_OLK
NETWORK_LIBS = \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/Network/libNetwork.a \
$(top_builddir)/src/NetworkOLK/libNetworkOLK.a
Moved Oliver's network stuff to his own subdir: NetworkOLK.
2000-01-12 18:09:35 +00:00
else
NETWORK_LIBS = \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/Network/libNetwork.a
Christian's new weather subsystem is causing problems with some compilers so I am allowing it to be #ifdef'd out until the compile problems can be resolved.
1999-08-12 17:13:44 +00:00
endif
Initial stab at a threaded tile loader contributed by Bernie Bright. He writes: Here are the final changes to add threads to the tile loading. All the thread related code is in the new FGTileLoader class. ./configure.in ./acconfig.h Added --with-threads option and corresponding ENABLE_THREADS definition. The default is no threads. ./src/Scenery/tilemgr Removed load_queue and associated references. This has been replaced by a new class FGTileLoader in FGNewCache. Made the global variable global_tile_cache a member. schedule_needed(): removed global_tile_cache.exists() tests since sched_tile() effectively repeats the test. initialize_queue(): removed code that loads tiles since this is now performed by FGTileLoader. update(): ditto ./src/Scenery/newcache Added new class FGTileLoader to manage tile queuing and loading. tile_map typedefs are private. exists() is a const member function. fill_in(): deleted load_tile(): added. ./src/Scenery/FGTileLoader The new threaded tile loader. Maintains a queue of tiles waiting to be loaded and an array of one or more threads to load the tiles. Currently only a single thread is created. The queue is guarded by a mutex to synchronize access. A condition variable signals the thread when the queue is non-empty. CLO: I made a few tweaks to address a couple issues, hopefully what we have is solid, but now we kick it out to the general public to see. :-)
2001-04-11 02:47:15 +00:00
if WITH_THREADS
THREAD_LIBS = -lsgthreads
else
THREAD_LIBS =
endif
Fixed (hopefully) a build problem with newer versions of automake and autoconf.
1999-10-30 02:37:56 +00:00
AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
Packaging fixes.
1999-06-04 20:35:47 +00:00
Updated 3dfx.sh to allow window vs. full screen via command line. Added 3dfx.sh to distribution. Updated rul serial output. Updated runfgfs.bat files.
1999-04-19 20:19:36 +00:00
EXTRA_DIST = 3dfx.sh runfgfs.in runfgfs.bat.in
Converting to Gnu autoconf system.
1998-04-03 22:09:02 +00:00
Renamed runfg.bat.in runfgfs.bat.in
1998-08-24 20:33:48 +00:00
bin_PROGRAMS = fgfs
Converting to Gnu autoconf system.
1998-04-03 22:09:02 +00:00
MSVC tweaks.
2001-07-12 17:55:44 +00:00
noinst_SCRIPTS = runfgfs.bat runfgfs
Tweaks to the runfgfs.bat script.
2000-09-14 17:36:39 +00:00
MSVC tweaks.
2001-07-12 17:55:44 +00:00
# bin_SCRIPTS = runfgfs
Converting to Gnu autoconf system.
1998-04-03 22:09:02 +00:00
Renamed runfg.bat.in runfgfs.bat.in
1998-08-24 20:33:48 +00:00
fgfs_SOURCES = \
Moved main.o to beginning of link line. Initialize navaid databases.
2000-04-24 23:51:26 +00:00
main.cxx \
- added fg_commands.cxx and fg_commands.hxx
2001-06-01 17:51:20 +00:00
fg_commands.cxx fg_commands.hxx \
C++ - ifing the code. Starting a bit of reorganization of lighting code.
1998-04-22 13:25:39 +00:00
fg_init.cxx fg_init.hxx \
Revamping I/O system.
1999-11-19 02:10:24 +00:00
fg_io.cxx fg_io.hxx \
1. Added src/Main/fgfs.hxx as a standard, top-level include file for FlightGear subsystems -- it isolates some of the config and #ifdef stuff in a single place. 2. Added a new FGSubsystem interface, defined in fgfs.hxx; so far, only FGControls implements it, but if that works, we can start letting it propagate through the system and simplify the code in main.cxx and fg_init.cxx (which is terrifyingly complex for anyone new to the project). 3. Added new src/Main/fgfs_props.[hc]xx files with convenience functions for tying properties under FlightGear. 4. Experimentally modified src/Controls/controls.cxx to tie properties directly (rather than tying to BFI functions). I'd appreciate it if you could get this into CVS as soon as possible, so we can see if the template stuff causes trouble for any other platforms before I add properties to the other subsystems. 5. Miscellaneous superficial modifications to other files. In addition, I've made a couple of further changes: 6. Modified BFI to add support for setting the view axes (i.e. with a joystick hat). 7. Cleaned up bfi.cxx and removed all cout statements.
2001-01-05 17:38:58 +00:00
fg_props.cxx fg_props.hxx \
fgfs.cxx fgfs.hxx \
Updates to go along with SGTime tweaks in SimGear.
2000-07-07 17:27:37 +00:00
globals.cxx globals.hxx \
Added new logging module.
2002-03-12 16:29:00 +00:00
logger.cxx logger.hxx \
Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H" Trying out some different option parsing code. Some code reorganization.
1998-04-24 00:49:17 +00:00
options.cxx options.hxx \
Added support for switching between fullscreen and window mode for Mesa/3dfx/glide. Added a basic splash screen. Restructured the main loop and top level initialization routines to do this. Hacked in some support for playing a startup mp3 sound file while rest of sim initializes. Currently only works in Unix using the mpg123 player. Waits for the mpg123 player to finish before initializing internal sound drivers.
1998-07-06 02:42:02 +00:00
splash.cxx splash.hxx \
Continued FGViewer cleanups. FGViewer is now a base class so that we can derive specific viewer classes from it. Here's what I currently have in mind: FGViewer | |-> FGViewerPRH (current system with orientation specified in | LaRCsim Euler angle convention) | |-> FGViewerLookAt Feed in a position, view direction, and up vector | |-> FGViewerHPR (similar to PRH, but using ssg hpr euler angle | convention) |-> others?
2000-10-25 22:59:02 +00:00
viewer.cxx viewer.hxx \
This patch includes the FGLocation class, a few fixes, cleanup in viewer code. Synced to CVS 19:36 EDT 2002-04-10 (after this evenings JSMsim and Base package updates). Description: Added FGLocation class which is new home for calculating matrix rotations. Viewer can now be configured to access rotations created by the model rather than repeating the same calculations again. Changed model initialization for the time being so that its location data is available for the viewer (currently required by other subsystems). At some point we can move this back to fg_init along with the viewer initialization. Seperated the update from the draw function in the model code. The viewer code needs the same matrix data, and moving the update portion at this time does not increase the number of matrix math iterations. Moved the model draw so that it always appears "in front" of lights and clouds. Reogranized viewer update routine for using the FGLocation class and simplified some more tasks. The routine is fairly easy to follow now, with the steps ordered and spelled out in comments. Viewmgr only updates the current (visible) view now, with the exception of an old reference to "chase view" that will be corrected in forthcoming changes. Also will be doing some work on the viewmgr outputs. Model is now clears the z-buffer in all modes. This will be changed with the next viewmgr update. The only side effect is that models always disappear when over 5km distant from the eye point (can't really see them anyway:-)). Other than a flag to indicate "internal" view I don't anticipate the configuration interface for viewmgr/views will be changed a lot for now. It is close to done. The next viewmgr update will however rework the outputs so may change location. This code will run with the previous version of preferences.xml, but will run faster with the newer version. I am attaching a preferences.xml that should not be commited before the code. All the changes are in the /sim/view section and should show a simpler view configuration that references model locations. Note that I've added a 2nd tower view in "lookfrom" mode for illustration purposes. You can look around using the mouse. You may want to remove that or comment it out.
2002-04-11 04:26:07 +00:00
viewmgr.cxx viewmgr.hxx \
location.cxx location.hxx
Tweaks to Gnu automake/autoconf system.
1998-04-08 23:32:28 +00:00
Renamed runfg.bat.in runfgfs.bat.in
1998-08-24 20:33:48 +00:00
fgfs_LDADD = \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/Aircraft/libAircraft.a \
Changes to support Dave Luff's initial ATC/ATIS module.
2001-11-07 17:55:28 +00:00
$(top_builddir)/src/ATC/libATC.a \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/Autopilot/libAutopilot.a \
$(top_builddir)/src/Cockpit/libCockpit.a \
Patch from Martin Dressler: This patch moves built-in Class (for now only mag-ribbon) into special directory as you have written it in TODO: in comments of this class in panel_io.cxx. IMHO it is good idea. I want to play with built-in classes and OpenGC and this will be useful.
2002-04-07 21:13:56 +00:00
$(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/Controls/libControls.a \
$(top_builddir)/src/FDM/libFlight.a \
$(top_builddir)/src/FDM/Balloon/libBalloon.a \
Renamed JSBsim to JSBSim ...
2000-07-24 17:27:12 +00:00
$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
Integrating YASim into the build system.
2001-12-01 06:22:49 +00:00
$(top_builddir)/src/FDM/YASim/libYASim.a \
Renamed JSBsim to JSBSim ...
2000-07-24 17:27:12 +00:00
$(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
UIUC flight model contribution. This is based on LaRCsim, but can read the aircraft parameters from a file. It still uses Tony's <crappy> (and I mean that in a constructive way) gear model. :-)
2000-03-22 22:01:33 +00:00
$(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/GUI/libGUI.a \
Moved FGAircraftModel subsystem out into its own directory, and separated out a new class, FG3DModel, that allows any arbitrary 3D model to be positioned, oriented, and animated (not just the aircraft).
2002-04-05 03:19:34 +00:00
$(top_builddir)/src/Model/libModel.a \
Moved main.o to beginning of link line. Initialize navaid databases.
2000-04-24 23:51:26 +00:00
$(top_builddir)/src/Navaids/libNavaids.a \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/Scenery/libScenery.a \
Reshuffled some of the sound code and created a "src/Sound" subdirectory.
2001-03-05 22:54:20 +00:00
$(top_builddir)/src/Sound/libSound.a \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/Airports/libAirports.a \
Moved Oliver's network stuff to his own subdir: NetworkOLK.
2000-01-12 18:09:35 +00:00
$(NETWORK_LIBS) \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(top_builddir)/src/Objects/libObjects.a \
$(top_builddir)/src/Time/libTime.a \
Christian's new weather subsystem is causing problems with some compilers so I am allowing it to be #ifdef'd out until the compile problems can be resolved.
1999-08-12 17:13:44 +00:00
$(WEATHER_LIBS) \
I'm attaching diffs to add a new FGInput module to FlightGear (src/Input). So far, FGInput replaces most of src/Main/keyboard.cxx (I've left a tiny stub); in the very near future, it will also take over control of the joystick, mouse (Norm permitting), and panel instrument interactions, so that there is a single mechanism for configuring all input devices. The new format should be (close to) self-explanatory by looking at the new base-package file keyboard.xml, which is now included by preferences.xml (I'll do the same thing for the joystick when I have a chance). I have not managed to move all keybindings into this file yet, but I've made a good start. I'm including Tony in the recipient list so that he can see how bindings can use an external XML file. This patch also adds support for multiple bindings for a single key, special keys (i.e. keypad and function keys), and key modifiers (shift/alt/ctrl); special keys use the PUI convention of adding 256 to the Glut key code. Unfortunately, everything comes with a price; in this case, I have not yet found a general mechanism for the old (hard-coded) modal bindings, which behaved differently depending on the autopilot state (i.e. left rudder or move AP heading left); with my patches, this functionality disappears, but you can still adjust the autopilot using the panel or the GUI input dialogs.
2001-05-23 23:01:15 +00:00
$(top_builddir)/src/Input/libInput.a \
Stubbed in initial support for 3d clouds.
2002-09-13 20:38:15 +00:00
-lsgroute -lsgsky -lsgclouds3d -lsgephem -lsgtiming -lsgio -lsgscreen \
Contributed by Dave Luff: Added fuel-flow and total fuel to the LaRCSim model. Its still a bit rough for now but it works, except the engine dosn't stop when fuel runs out at the moment since there's no refuelling capability in the sim just now. It takes about 4 gallons use before you see the fuel guages begin to drop since there's 28 gal per tank but the guages go to 26.
2001-03-01 16:32:29 +00:00
-lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
Tidy up the autoconf/automake configuration a bit. - Removed some old cruft. - Removed some support for older versions of automake which technically was correct, but caused the newer automakes to squawk warnings during an initial sanity check (which isn't done very intelligently.) NOTE: this fix is technically not correct for older version of automake. These older version use the variable "INCLUDES" internally and could have them already set to an important value. That is why we were appending our values to them. However, newer versions of automake don't set this value themselves so it is an error to append to a non-existant variable. We seem to "get away" with overwriting the value on older versions of automake, but if you have problems, consider upgrading to at least automake-1.5.
2002-08-25 19:40:04 +00:00
-lsgserial \
Initial stab at a threaded tile loader contributed by Bernie Bright. He writes: Here are the final changes to add threads to the tile loading. All the thread related code is in the new FGTileLoader class. ./configure.in ./acconfig.h Added --with-threads option and corresponding ENABLE_THREADS definition. The default is no threads. ./src/Scenery/tilemgr Removed load_queue and associated references. This has been replaced by a new class FGTileLoader in FGNewCache. Made the global variable global_tile_cache a member. schedule_needed(): removed global_tile_cache.exists() tests since sched_tile() effectively repeats the test. initialize_queue(): removed code that loads tiles since this is now performed by FGTileLoader. update(): ditto ./src/Scenery/newcache Added new class FGTileLoader to manage tile queuing and loading. tile_map typedefs are private. exists() is a const member function. fill_in(): deleted load_tile(): added. ./src/Scenery/FGTileLoader The new threaded tile loader. Maintains a queue of tiles waiting to be loaded and an array of one or more threads to load the tiles. Currently only a single thread is created. The queue is guarded by a mutex to synchronize access. A condition variable signals the thread when the queue is non-empty. CLO: I made a few tweaks to address a couple issues, hopefully what we have is solid, but now we kick it out to the general public to see. :-)
2001-04-11 02:47:15 +00:00
$(THREAD_LIBS) \
Additional build system tweaks.
2002-09-03 01:12:26 +00:00
-lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg -lplibul \
Replaced gdbm with metakit. Involves a new simgear version and a new database format for the airports in the base package.
2000-05-27 05:54:02 +00:00
-lmk4 -lz \
Updated build system to remove DEFS += -DFOO type lines. This doesn't seem to be supported in recent versions of autoconf.
1999-06-24 20:38:31 +00:00
$(opengl_LIBS) \
$(audio_LIBS)
Updates to build system to better support automake-1.5 - automake-1.4 sets default values for INCLUDES which we can't overwrite. - automake-1.5 renames this to DEFAULT_INCLUDES and leaves INCLUDES open for the developer to use. Thus for automake-1.4 we are forced to 'append' to INCLUDES and in automake-1.5 we can just set the value to whatever we like. Unfortunately, the behaviors of the two versions are mutually incompatible. The solution I am committing now works for both versions but automake-1.5 generates a lot of spurious warning messages that are annoying, but not fatal.
2001-12-28 22:29:59 +00:00
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
Copy permalink