From: Hans U. N. <hu...@n-...> - 2007-07-27 00:06:15
|
Hans Ulrich Niedermann wrote: > 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 Actually, make that configure.ac | 80 ++++++++++++++--- src/GUI/gui.cxx | 5 - src/Main/Makefile.am | 158 ++++++++++++++++++++++++++++++----- 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, 254 insertions(+), 40 deletions(-) (Including a few dozen redundant configure.ac/Makefile.am lines.) This patch now concentrates all the GLUT/SDL/osgViewer specific stuff in src/main/libOS-{GLUT,SDL,osgViewer}.a libraries which consists of renderer.cxx, one of fg_os*.cxx and FGManipulator.cxx for the osgViewer variant. All other code is only affected by the decision about GLUT/SDL/osgViewer when it comes to linking the functions defined in fg_os.h to the binary, not at compile time. Building the fgfs executable is thus now just a matter of linking bootstrap.o, libMain.a, libOS-FOO.a, the other FG lib*.a convenience libraries and the correct "external" libraries depending on the libOS-FOO.a used. |