On 10/31/07, Durk Talsma <[EMAIL PROTECTED]> wrote:
> As I was typing this reply, I got your other mail. Yes, you're pretty much
> right that Atlas no longer compiles against Simgear CVS. But, most fixes are
> pretty straightforward.
Provided one already has that optind=0; stuff, the attached patch
should take care of the linking flags and some simgear type changes I
encountered. (Minus some local hackery I removed; it does compile and
seemingly run as of last week's cvs HEAD of simgear , qualified by
that evil "for me")
HTH
K. Hoercher
diff -Nur Atlas.cleanorig/src/Makefile.am Atlas.cleanhack/src/Makefile.am
--- Atlas.cleanorig/src/Makefile.am 2007-10-26 13:19:27.000000000 +0200
+++ Atlas.cleanhack/src/Makefile.am 2007-10-26 13:19:02.000000000 +0200
@@ -28,6 +28,7 @@
Preferences.cxx Preferences.hxx
Atlas_LDADD = \
+ -lsgstructure -lsgprops \
-lsgmagvar -lsgtiming -lsgmisc -lsgio -lsgserial -lsgdebug -lsgbucket\
-lsgxml -lplibsg -lplibpu -lplibul -lplibfnt -lplibnet \
$(opengl_LIBS) \
@@ -45,8 +46,9 @@
fg_mkdir.cxx fg_mkdir.hxx
Map_LDADD = \
+ -lsgstructure -lsgprops -lsgserial -lsgxml \
-lsgmagvar -lsgtiming -lsgmisc -lsgio -lsgdebug \
- -lplibsg -lplibpu -lplibul -lplibfnt -lsgbucket -lsgscreen \
+ -lplibsg -lplibpu -lplibul -lplibfnt -lplibnet -lsgbucket -lsgscreen \
$(opengl_LIBS) \
-lpng -lz -ljpeg
@@ -61,8 +63,9 @@
Scenery.cxx Scenery.hxx
MapPS_LDADD = \
+ -lsgstructure -lsgprops -lsgserial -lsgxml \
-lsgmagvar -lsgtiming -lsgmisc -lsgio -lsgdebug \
- -lplibsg -lsgbucket \
+ -lplibsg -lplibnet -lsgbucket \
-lpng -lz
GetMap_SOURCES = \
diff -Nur Atlas.cleanorig/src/MapMaker.cxx Atlas.cleanhack/src/MapMaker.cxx
--- Atlas.cleanorig/src/MapMaker.cxx 2007-10-26 13:19:27.000000000 +0200
+++ Atlas.cleanhack/src/MapMaker.cxx 2007-10-26 13:19:02.000000000 +0200
@@ -653,8 +653,8 @@
/* convert point_list of wgs84 nodes to a list of points transformed
into the maps local coordinate system */
- const point_list wgs84_nodes = tile.get_wgs84_nodes();
- for ( point_list::const_iterator node = wgs84_nodes . begin();
+ const std::vector<SGVec3d> wgs84_nodes = tile.get_wgs84_nodes();
+ for ( std::vector<SGVec3d>::const_iterator node = wgs84_nodes . begin();
node != wgs84_nodes . end();
node++ ) {
@@ -674,8 +674,8 @@
}
// same as above for normals
- const point_list m_norms = tile.get_normals();
- for ( point_list::const_iterator normal = m_norms.begin();
+ const std::vector<SGVec3f> m_norms= tile.get_normals();
+ for ( std::vector<SGVec3f>::const_iterator normal = m_norms.begin();
normal != m_norms.end();
normal++ ) {
// Make a new normal
-------------------------------------------------------------------------
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
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
