Melchior FRANZ wrote: > * Tim Moore -- Thursday 26 July 2007: >> I'm still quite interested in your GSA change with the cleanup you mentioned >> of moving plib init stuff into the GSA classes and will commit it unless >> other >> developers object.
That cleanup has been incorporated into the patch. However, I think the one presented below is a better idea for FG in its current state. > I object to the 23 files changing patch that puts all interfaces into > every fgfs binary. If there's another patch with only cleanup, then > please present that here on the list. http://flightgear.lauft.net/FG-puInit-static-multi.patch configure.ac | 71 +++++++++++++++++----- src/GUI/gui.cxx | 5 - src/Main/Makefile.am | 110 +++++++++++++++++++++++++++++------ 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 +++- 9 files changed, 199 insertions(+), 38 deletions(-) Notes: * To clarify meanings and to possibly get rid of the GLUT version, we now treat all three versions equally regarding AM_CONDITIONALs and -DENABLE_FOO definitions. That required a few changes to configure.ac. * Building the osgViewer version has been made the default now. Regardless of the default however, one can (at configure time) choose which (additional) version(s) to build at using the appropriate --enable-osgviewer --enable-sdl --enable-glut and the respective --disable-foo parameters. * About 30..50 lines in configure.ac and Makefile.am are redundant (CLASSIC_FGFS) and can be removed after a decision on whether we want a classic "fgfs" binary to be built in src/Main at all. * 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. * There are two versions of installing the "fgfs" executable: a) --enable-classic-fgfs Builds separate executable "fgfs" (in addition to "fgfs-osgViewer", "fgfs-GLUT", "fgfs-SDL"), but installs only "fgfs". b) --disable-classic-fgfs (default) Only build "fgfs-osgViewer", "fgfs-GLUT", "fgfs-SDL". Choose one of them to install as "fgfs". I suggest making b) the default and removing the code for a). * If you insist, I can prepare a version which only builds one version at "make all" time and requires an explicit $ make -C src/Main fgfs-GLUT to build any of the versions which are not installed. * Another option is to make building "fgfs" (with osgViewer) mandatory, and only optionally build the other versions as "fgfs-GLUT" and "fgfs-SDL", respectively (and possibly even install them). That would get rid of much of the Makefile.am ugliness. I hope that after the classic-fgfs decision, we can get this committed. ------------------------------------------------------------------------- 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
