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

114 lines
3.1 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
Latest episode of the MultiPlayer saga
2003-03-21 20:33:41 +00:00
if ENABLE_MPLAYER_AS
FlightGear can handle network connections even without multiplayer support
2003-07-09 19:55:08 +00:00
MPLAYER_LIBS = $(top_builddir)/src/MultiPlayer/libMultiPlayer.a
Latest episode of the MultiPlayer saga
2003-03-21 20:33:41 +00:00
else
MPLAYER_LIBS =
endif
Moved Oliver's network stuff to his own subdir: NetworkOLK.
2000-01-12 18:09:35 +00:00
if ENABLE_NETWORK_OLK
FlightGear can handle network connections even without multiplayer support
2003-07-09 19:55:08 +00:00
NETWORK_LIBS = $(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
Latest episode of the MultiPlayer saga
2003-03-21 20:33:41 +00:00
NETWORK_LIBS =
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
Split up into and . Fix a typo for FreeBSD. And do some Makefile cleanups
2003-07-07 13:57:43 +00:00
THREAD_LIBS = -lsgthreads $(thread_LIBS)
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
else
THREAD_LIBS =
endif
Add 3d cloud support back in
2003-08-04 17:57:15 +00:00
if FG_USE_CLOUDS_3D
CLOUD3D_LIBS = -lsgclouds3d
else
CLOUD3D_LIBS =
endif
Make all PSL support conditional, because it's not included in plib 1.6. The macro is HAVE_PLIB_PSL.
2003-01-17 12:41:47 +00:00
if HAVE_PLIB_PSL
Do not require libScripting.a unless PSL is available.
2003-01-17 18:25:34 +00:00
SCRIPTING_LIBS = $(top_builddir)/src/Scripting/libScripting.a
Make all PSL support conditional, because it's not included in plib 1.6. The macro is HAVE_PLIB_PSL.
2003-01-17 12:41:47 +00:00
PSL_LIBS = -lplibpsl
else
Do not require libScripting.a unless PSL is available.
2003-01-17 18:25:34 +00:00
SCRIPTING_LIBS =
Make all PSL support conditional, because it's not included in plib 1.6. The macro is HAVE_PLIB_PSL.
2003-01-17 12:41:47 +00:00
PSL_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
Reorganization of main.cxx
2003-08-17 09:54:41 +00:00
noinst_LIBRARIES = libMain.a
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
Reorganization of main.cxx
2003-08-17 09:54:41 +00:00
libMain_a_SOURCES = \
main.cxx main.hxx \
- 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 \
Add utils.[ch]xx.
2002-09-27 22:02:09 +00:00
util.cxx util.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 is step "1" of probably "many" in the process of separating out the scene management code and organizing it within simgear. My strategy is to identify the code I want to move, and break it's direct flightgear dependencies. Then it will be free to move over into the simgear package. - Moved some property specific code into simgear/props/ - Split out the condition code from fgfs/src/Main/fg_props and put it in it's own source file in simgear/props/ - Created a scene subdirectory for scenery, model, and material property related code. - Moved location.[ch]xx into simgear/scene/model/ - The location and condition code had dependencies on flightgear's global state (all the globals-> stuff, the flightgear property tree, etc.) SimGear code can't depend on it so that data has to be passed as parameters to the functions/methods/constructors. - This need to pass data as function parameters had a dramatic cascading effect throughout the FlightGear code.
2003-05-06 23:46:24 +00:00
viewmgr.cxx viewmgr.hxx
Tweaks to Gnu automake/autoconf system.
1998-04-08 23:32:28 +00:00
Reorganization of main.cxx
2003-08-17 09:54:41 +00:00
fgfs_SOURCES = bootstrap.cxx
Renamed runfg.bat.in runfgfs.bat.in
1998-08-24 20:33:48 +00:00
fgfs_LDADD = \
Reorganization of main.cxx
2003-08-17 09:54:41 +00:00
$(top_builddir)/src/Main/libMain.a \
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 \
Shuffled location of ExternalNet.[ch]xx to it's own subdir. Removed External.[ch]xx which is a duplicate of NullFDM.[ch]xx --fdm=external is preserved but just maps to NullFDM.
2002-09-28 21:42:03 +00:00
$(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
Add support for --fdm=pipe,<pipe_name>
2003-03-03 04:34:27 +00:00
$(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.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 \
Stub in a place holder for the electrical system model.
2002-09-24 15:24:04 +00:00
$(top_builddir)/src/Input/libInput.a \
$(top_builddir)/src/Instrumentation/libInstrumentation.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 \
Latest episode of the MultiPlayer saga
2003-03-21 20:33:41 +00:00
$(top_builddir)/src/Network/libNetwork.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 \
Do not require libScripting.a unless PSL is available.
2003-01-17 18:25:34 +00:00
$(SCRIPTING_LIBS) \
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 \
Latest episode of the MultiPlayer saga
2003-03-21 20:33:41 +00:00
$(MPLAYER_LIBS) \
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 \
Curt: I have added a fledgling replay system that records flight data and control positions during the flight. I have added an internal command called "replay" which will trigger a replay of the entire saved flight data set. This could be bound to a keyboard or menu command, in fact this entire module is screaming for someone to build a gui to control playback speed, amount of playback, etc. This is the initial version so there are kinks that still need to be worked out, please be patient.
2003-07-17 18:24:17 +00:00
$(top_builddir)/src/Replay/libReplay.a \
Started new module and sub-modules for aircraft systems, including an initial simplistic vacuum system that's not yet connected to anything.
2002-09-23 19:55:10 +00:00
$(top_builddir)/src/Systems/libSystems.a \
Code reorganization.
2000-02-15 03:30:01 +00:00
$(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) \
Remove one dependence on MetaKit.
2003-08-28 20:53:08 +00:00
-lsgroute -lsgclouds3d -lsgsky -lsgsound -lsgephem -lsgmaterial -lsgtgdb -lsgmodel \
Update required for the fastmath module
2003-06-28 12:19:58 +00:00
-lsgtiming -lsgio -lsgscreen -lsgmath -lsgbucket -lsgprops -lsgdebug \
Add 3d cloud support back in
2003-08-04 17:57:15 +00:00
-lsgmagvar -lsgmisc -lsgxml -lsgsound -lsgserial $(CLOUD3D_LIBS) \
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) \
Make all PSL support conditional, because it's not included in plib 1.6. The macro is HAVE_PLIB_PSL.
2003-01-17 12:41:47 +00:00
-lplibpu -lplibfnt -lplibjs -lplibnet -lplibssg -lplibsg -lplibul \
FlightGear can handle network connections even without multiplayer support
2003-07-09 19:55:08 +00:00
$(network_LIBS) \
Make all PSL support conditional, because it's not included in plib 1.6. The macro is HAVE_PLIB_PSL.
2003-01-17 12:41:47 +00:00
$(PSL_LIBS) \
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