http://flightgear.lauft.net/FG-puInit-static-multi.patch
Make osgViewer default for fgfs, optionally build other executables
This patch concentrates all the GLUT/SDL/osgViewer specific stuff in
src/Main/libOS-{GLUT,SDL,osgViewer}.a convenience libraries which
consist of renderer.cxx, one of fg_os*.cxx and, for the osgViewer
variant, FGManipulator.cxx.
All other FG code does not need any changes at compile time. Only at
link time, the decision about GLUT/SDL/osgViewer is made by linking
the respective set of functions implementing the fg_os.h interface
(i.e. the respective libOS-FOO.a) to the executable.
Notes:
* To clarify the meanings of ENABLE_FOO and to possibly get rid of
the GLUT version, we now treat all three versions equally
regarding AM_CONDITIONALs and -DENABLE_FOO definitions, i.e. no
#else branches with implicit meanings.
* The possible parallel building of multiple executables in src/Main
using "make" aka "make all" (of which only one is installed at
"make install" time) accounts for most of the changes to
src/Main/Makefile.am.
* Builds these binaries in src/Main/:
"fgfs" (osgViewer, if not --disable-osgviewer, is installed)
"fgfs-GLUT" (GLUT, only if --enable-glut, not installed)
"fgfs-SDL" (SDL, only if --enable-sdl, not installed)
* Non-automake builds:
MSVC6: uses osgViewer (changed, needs check of FlightGear.dsp)
MSVC7.1: uses osgViewer (changed, needs check of projects/VC7.1/*)
MSVC8: uses osgViewer (as before, projects/VC8/*)
Could Windows builders confirm that the MSVC6 and MSVC7.1 changes
work?
Patch-last-updated: Sat Jul 28 19:05:29 UTC 2007
===================================================================
FlightGear.dsp | 2
configure.ac | 72 ++++++++++++++++----
projects/VC7.1/FlightGear.vcproj | 2
src/GUI/gui.cxx | 5 -
src/Include/config.h-msvc6.in | 3
src/Include/config.h-msvc71.in | 3
src/Include/config.h-msvc8.in | 2
src/Main/Makefile.am | 108 +++++++++++++++++++++++++------
src/Main/fg_os.cxx | 10 ++
src/Main/fg_os.hxx | 2
src/Main/fg_os_osgviewer.cxx | 11 +++
src/Main/fg_os_sdl.cxx | 10 ++
src/Main/renderer.cxx | 5 +
src/Main/renderer.hxx | 13 +++
14 files changed, 203 insertions(+), 45 deletions(-)
This is the smallest patch so far, I think.
Does someone have concerns about types and names of the executables
created, and being installed?
Does this address all objections?
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Flightgear-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
