Remove all plib deps completely. TG is now plib-free :)
This commit is contained in:
Christian Schmitt
parent
00ab1eee1b
commit
17dbaffadd
14 changed files with 16 additions and 61 deletions
|
|
@ -1,6 +1,6 @@
|
|||
EXTRA_DIST = \
|
||||
README README README.cygwin README.gpc README.gts README.howto \
|
||||
README.plib README.SimGear \
|
||||
README.SimGear \
|
||||
TerraGear.dsp TerraGear.dsw
|
||||
acinclude.m4 \
|
||||
autogen.sh
|
||||
|
|
|
|||
16
README.plib
16
README.plib
|
|
@ -1,16 +0,0 @@
|
|||
[This file is mirrored in both the FlightGear and SimGear packages.]
|
||||
|
||||
You *must* have plib version 1.6.0 or later installed on your system
|
||||
to build FlightGear!" Flight Gear is no longer compatible with the
|
||||
earlier versions of the library.
|
||||
|
||||
You can get the latest version of plib from:
|
||||
|
||||
http://plib.sourceforge.net
|
||||
|
||||
Build notes:
|
||||
|
||||
You should be able to just run "./configure" to configure the package
|
||||
and use all of plib's defaults. Then run "make" followed by "make
|
||||
install". By default, plib installs itself into /usr so if you don't
|
||||
like this, be sure to specify an alternate prefix such as --prefix=/usr/local
|
||||
24
configure.ac
24
configure.ac
|
|
@ -26,14 +26,6 @@ if test "x$with_simgear" != "x" ; then
|
|||
EXTRA_DIRS="${EXTRA_DIRS} $with_simgear"
|
||||
fi
|
||||
|
||||
# specify the plib location
|
||||
AC_ARG_WITH(plib, [ --with-plib=PREFIX Specify the prefix path to plib])
|
||||
|
||||
if test "x$with_plib" != "x" ; then
|
||||
echo "plib prefix is $with_plib"
|
||||
EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
|
||||
fi
|
||||
|
||||
# specify the osg location
|
||||
AC_ARG_WITH(osg, [ --with-osg=PREFIX Specify the prefix path to osg])
|
||||
|
||||
|
|
@ -170,7 +162,6 @@ dnl Check for MS Windows environment
|
|||
AC_CHECK_HEADER(windows.h)
|
||||
|
||||
dnl extra library and include directories
|
||||
# EXTRA_DIRS="/usr/local/plib /usr/X11R6"
|
||||
EXTRA_DIRS="$EXTRA_DIRS /usr/X11R6"
|
||||
|
||||
if test -d /opt/X11R6 ; then
|
||||
|
|
@ -291,8 +282,6 @@ AC_CHECK_LIB(tiff, TIFFOpen,,,)
|
|||
AM_CONDITIONAL(HAVE_LIBTIFF, test x$ac_cv_lib_tiff_TIFFOpen = xyes)
|
||||
|
||||
AC_LANG_PUSH(C++)
|
||||
# needed for plib 1.8.x or later
|
||||
AC_CHECK_LIB(plibul, ulInit,,,)
|
||||
|
||||
opengl_LIBS="$LIBS"
|
||||
LIBS="$base_LIBS"
|
||||
|
|
@ -304,19 +293,6 @@ AC_SUBST(support_LIBS)
|
|||
|
||||
AM_CONDITIONAL(HAVE_XWINDOWS, test "x$ac_cv_lib_X11_XCreateWindow" = "xyes" )
|
||||
|
||||
dnl Check for "plib" without which we cannot go on
|
||||
AC_CHECK_HEADER(plib/sg.h)
|
||||
if test "x$ac_cv_header_plib_sg_h" != "xyes"; then
|
||||
echo
|
||||
echo "You *must* have the plib library installed on your system to build"
|
||||
echo "TerraGear!"
|
||||
echo
|
||||
echo "Please see README.plib for more details."
|
||||
echo
|
||||
echo "configure aborted."
|
||||
exit
|
||||
fi
|
||||
|
||||
dnl Check for "libnewmat" without which we cannot build airport surfaces
|
||||
AC_CHECK_HEADER(newmat/newmat.h)
|
||||
AM_CONDITIONAL(HAVE_NEWMAT, test "x$ac_cv_header_newmat_newmat_h" = "xyes" )
|
||||
|
|
|
|||
|
|
@ -41,8 +41,6 @@
|
|||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <plib/sg.h> // plib include
|
||||
|
||||
#include <simgear/constants.h>
|
||||
#include <simgear/bucket/newbucket.hxx>
|
||||
#include <simgear/io/sg_binobj.hxx>
|
||||
|
|
@ -913,11 +911,10 @@ void build_airport( string airport_id, float alt_m,
|
|||
// SG_LOG(SG_GENERAL, SG_DEBUG, "geod = " << p);
|
||||
// SG_LOG(SG_GENERAL, SG_DEBUG, "cart = " << tmp);
|
||||
|
||||
sgdVec3 tmp;
|
||||
sgdSetVec3( tmp, vnt.x(), vnt.y(), vnt.z() );
|
||||
sgdNormalizeVec3( tmp );
|
||||
SGVec3d tmp( vnt.x(), vnt.y(), vnt.z() );
|
||||
tmp = normalize(tmp);
|
||||
Point3D vn( tmp.x(), tmp.y(), tmp.z() );
|
||||
|
||||
Point3D vn( tmp[0], tmp[1], tmp[2] );
|
||||
SG_LOG(SG_GENERAL, SG_DEBUG, "found normal for this airport = " << tmp);
|
||||
|
||||
for ( k = 0; k < (int)rwy_polys.size(); ++k ) {
|
||||
|
|
|
|||
|
|
@ -25,9 +25,10 @@
|
|||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#include <cstdlib>
|
||||
|
||||
#include <simgear/math/sg_geodesy.hxx>
|
||||
|
||||
#include <plib/sg.h>
|
||||
#include <simgear/constants.h>
|
||||
#include <simgear/debug/logstream.hxx>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ fgfs_construct_LDADD = \
|
|||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
|
||||
-lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lsgstructure -lsgxml \
|
||||
-lplibsg -lplibul -lgenpolyclip -lz
|
||||
-lgenpolyclip -lz
|
||||
|
||||
fgfs_master_SOURCES = master.cxx
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ fgfs_tools_server_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml $(network_LIBS)
|
|||
|
||||
fgfs_tools_client_SOURCES = client.cxx
|
||||
|
||||
fgfs_tools_client_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml $(network_LIBS) -lplibul
|
||||
fgfs_tools_client_LDADD = -lsgbucket -lsgmisc -lsgdebug -lsgxml $(network_LIBS)
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)/src \
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ noinst_PROGRAMS = testhgt
|
|||
|
||||
testhgt_SOURCES = testhgt.cxx
|
||||
testhgt_LDADD = libHGT.a \
|
||||
-lsgbucket -lsgmisc -lsgdebug -lz -lplibul
|
||||
-lsgbucket -lsgmisc -lsgdebug -lz
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
#include <simgear/compiler.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <cstdlib>
|
||||
#include <time.h>
|
||||
#include <zlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@
|
|||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <plib/sg.h>
|
||||
|
||||
#include <simgear/compiler.h>
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ hgtchop_SOURCES = \
|
|||
|
||||
hgtchop_LDADD = \
|
||||
$(top_builddir)/src/Lib/HGT/libHGT.a \
|
||||
-lsgbucket -lsgmisc -lsgdebug -lsgxml -lz -lplibul
|
||||
-lsgbucket -lsgmisc -lsgdebug -lsgxml -lz
|
||||
$(base_LIBS)
|
||||
|
||||
if HAVE_LIBTIFF
|
||||
|
|
@ -51,7 +51,7 @@ srtmchop_SOURCES = \
|
|||
|
||||
srtmchop_LDADD = \
|
||||
$(top_builddir)/src/Lib/HGT/libHGT.a \
|
||||
-lsgbucket -lsgmisc -lsgdebug -lsgxml -lz -lplibul -ltiff
|
||||
-lsgbucket -lsgmisc -lsgdebug -lsgxml -lz -ltiff
|
||||
$(base_LIBS)
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,9 @@
|
|||
|
||||
#include <simgear/compiler.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include <plib/sg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <simgear/math/sg_geodesy.hxx>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ bin_PROGRAMS = terrafit
|
|||
terrafit_SOURCES = terrafit.cc
|
||||
terrafit_LDADD = $(top_builddir)/src/Prep/Terra/libTerra.a \
|
||||
$(top_builddir)/src/Lib/Array/libArray.a \
|
||||
-lsgbucket -lsgstructure -lsgmisc -lsgdebug -lz -lplibul
|
||||
-lsgbucket -lsgstructure -lsgmisc -lsgdebug -lz
|
||||
|
||||
EXTRA_DIST = terrafit.README terrafit.py.in
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ poly2ogr_CXXFLAGS=$(GDAL_CFLAGS)
|
|||
poly2ogr_LDADD = \
|
||||
$(GDAL_LIBS) \
|
||||
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
|
||||
-lsgio -lsgbucket -lsgmath -lsgstructure -lsgmisc -lsgdebug -lz -lplibul
|
||||
-lsgio -lsgbucket -lsgmath -lsgstructure -lsgmisc -lsgdebug -lz
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src/Lib
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue