FlightGear-libs.patch

   1 diff -burN FlightGear-0.9.6.orig/src/Airports/Makefile.am FlightGear-0.9.6/src/Airports/Makefile.am
   2 --- FlightGear-0.9.6.orig/src/Airports/Makefile.am      2004-11-01 17:13:02.183256960 +0100
   3 +++ FlightGear-0.9.6/src/Airports/Makefile.am   2004-11-01 17:13:54.304333352 +0100
   4 @@ -7,6 +7,7 @@
   5         simple.cxx simple.hxx
   6
   7  calc_loc_SOURCES = calc_loc.cxx
   8 -calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS)
   9 +calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS) \
  10 +                -lsgprops -lsgstructure -lsgxml
  11
  12  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
  13 diff -burN FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am FlightGear-0.9.6/src/FDM/YASim/Makefile.am
  14 --- FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am     2004-11-01 17:13:02.016282344 +0100
  15 +++ FlightGear-0.9.6/src/FDM/YASim/Makefile.am  2004-11-01 17:14:28.542128416 +0100
  16 @@ -43,9 +43,9 @@
  17
  18  yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES)
  19
  20 -yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
  21 +yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz
  22
  23  proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES)
  24 -proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS)
  25 +proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz
  26
  27  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
  28 diff -burN FlightGear-0.9.6.orig/src/Main/Makefile.am FlightGear-0.9.6/src/Main/Makefile.am
  29 --- FlightGear-0.9.6.orig/src/Main/Makefile.am  2004-11-01 17:13:02.143263040 +0100
  30 +++ FlightGear-0.9.6/src/Main/Makefile.am       2004-11-01 17:15:10.865694256 +0100
  31 @@ -104,6 +104,6 @@
  32  metar_LDADD = \
  33          -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
  34          -lplibnet -lplibul $(network_LIBS) \
  35 -        -lz $(base_LIBS)
  36 +        -lz $(base_LIBS) -lsgserial -lsgprops -lsgxml
  37
  38  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
  39 diff -burN FlightGear-0.9.6.orig/src/Navaids/Makefile.am FlightGear-0.9.6/src/Navaids/Makefile.am
  40 --- FlightGear-0.9.6.orig/src/Navaids/Makefile.am       2004-11-01 17:13:02.239248448 +0100
  41 +++ FlightGear-0.9.6/src/Navaids/Makefile.am    2004-11-01 17:15:37.842593144 +0100
  42 @@ -15,6 +15,6 @@
  43  # testnavs_LDADD = \
  44  #      libNavaids.a \
  45  #      -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
  46 -#      -lsgstructure $(base_LIBS) -lz
  47 +#      -lsgstructure $(base_LIBS) -lz -lsgprops
  48
  49  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
  50 diff -burN FlightGear-0.9.6.orig/tests/Makefile.am FlightGear-0.9.6/tests/Makefile.am
  51 --- FlightGear-0.9.6.orig/tests/Makefile.am     2004-11-01 17:13:02.274243128 +0100
  52 +++ FlightGear-0.9.6/tests/Makefile.am  2004-11-01 17:15:59.265336392 +0100
  53 @@ -17,4 +17,4 @@
  54  test_text_SOURCES = test-text.cxx
  55
  56  test_up_SOURCES = test-up.cxx
  57 -test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS)
  58 +test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS) -lsgprops
  59 --- FlightGear-0.9.9.org/src/GUI/Makefile.am    2005-07-30 16:20:24.000000000 +0200
  60 +++ FlightGear-0.9.9/src/GUI/Makefile.am        2005-12-07 22:09:58.000000000 +0100
  61 @@ -22,4 +22,6 @@
  62
  63  layout_test_LDADD = libGUI.a \
  64                      -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml \
  65 -                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS)
  66 +                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS) \
  67 +                   -lxml
  68 +
  69 --- FlightGear-0.9.10/utils/GPSsmooth/Makefile.am.orig  2006-08-16 20:29:39.000000000 -0700
  70 +++ FlightGear-0.9.10/utils/GPSsmooth/Makefile.am       2006-08-16 20:36:00.000000000 -0700
  71 @@ -5,7 +5,7 @@
  72         gps_main.cxx
  73
  74  GPSsmooth_LDADD = \
  75 -       -lsgtiming -lsgmisc -lsgdebug -lplibnet -lplibul \
  76 +       -lsgtiming -lsgmisc -lsgdebug -lplibnet -lplibul -lsgprops -lsgxml -lsgmisc -lsgstructure \
  77         $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz
  78
  79  MIDGsmooth_SOURCES = \
  80 @@ -13,7 +13,7 @@
  81         MIDG_main.cxx
  82
  83  MIDGsmooth_LDADD = \
  84 -       -lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug \
  85 +       -lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug -lsgstructure -lsgprops -lsgxml \
  86         -lplibnet -lplibul \
  87         $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz
  88
  89 --- FlightGear-0.9.10/utils/Modeller/Makefile.am.orig   2006-08-16 20:36:44.000000000 -0700
  90 +++ FlightGear-0.9.10/utils/Modeller/Makefile.am        2006-08-16 20:38:58.000000000 -0700
  91 @@ -8,4 +8,6 @@
  92  animassist_LDADD = $(base_LIBS)
  93
  94  normalmap_SOURCES = normalmap.cxx
  95 -normalmap_LDADD = -lsgscreen $(opengl_LIBS) $(base_LIBS) -lz
  96 +normalmap_LDADD = -lsgscreen -lsgdebug \
  97 +       -lplibssg -lplibsg -lplibul \
  98 +       $(opengl_LIBS) $(base_LIBS) -lz
  99 --- FlightGear-0.9.10/src/Main/metar_main.cxx.orig      2006-08-16 20:26:14.000000000 -0700
 100 +++ FlightGear-0.9.10/src/Main/metar_main.cxx   2006-08-16 20:26:55.000000000 -0700
 101 @@ -28,6 +28,10 @@
 102  #include <simgear/environment/metar.hxx>
 103  #include <simgear/structure/exception.hxx>
 104
 105 +// Not really used there definitions - just to fix missing symbol in libsgsky.so.
 106 +class SGSky;
 107 +SGSky *thesky;
 108 +
 109  using namespace std;
 110
 111  // text color
 112 --- FlightGear-0.9.10/src/Main/Makefile.am.mkorig       2006-08-17 14:09:38.000000000 -0700
 113 +++ FlightGear-0.9.10/src/Main/Makefile.am      2006-08-17 14:16:55.000000000 -0700
 114 @@ -106,8 +106,9 @@
 115  metar_SOURCES = metar_main.cxx
 116
 117  metar_LDADD = \
 118 -        -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \
 119 -        -lplibnet -lplibul $(network_LIBS) \
 120 -        -lz $(base_LIBS) -lsgserial -lsgprops -lsgxml
 121 +        -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug -lsgsky  \
 122 +        -lplibnet -lplibul -lplibsg -lplibssg -lopenal $(network_LIBS) \
 123 +        -lz -lGLU $(base_LIBS) -lsgserial -lsgprops -lsgxml -lsgscreen -lsgsound -lsgmath
 124 +
 125
 126  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim