fly/terragear
1
0
Fork 0
Code Activity

Compile srtmchop under Linux

Browse source
This commit is contained in:
Frederic Bouvier 2009-02-23 23:33:16 +01:00 committed by Ralf Gerlich
parent 814007e06c
commit beadd0123a
6 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -257,6 +257,9 @@ if test "x$ac_cv_lib_glut_glutGameModeString" = "xno"; then
exit 1 exit 1
fi fi
AC_CHECK_LIB(tiff, TIFFOpen,,,)
AM_CONDITIONAL(HAVE_LIBTIFF, test x$ac_cv_lib_tiff_TIFFOpen = xyes)
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
# needed for plib 1.8.x or later # needed for plib 1.8.x or later
AC_CHECK_LIB(plibul, ulInit,,,) AC_CHECK_LIB(plibul, ulInit,,,)

2
src/Lib/HGT/Makefile.am
View file

@ -8,7 +8,7 @@ testhgt_SOURCES = testhgt.cxx
testhgt_LDADD = \ testhgt_LDADD = \
$(top_builddir)/src/Lib/HGT/libHGT.a \ $(top_builddir)/src/Lib/HGT/libHGT.a \
-lsgbucket -lsgmisc -lsgdebug -lz -lsgbucket -lsgmisc -lsgdebug -lz -lplibul
INCLUDES = -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir)/src

2
src/Lib/HGT/hgt.cxx
View file

@ -87,7 +87,7 @@ TGHgt::open ( const SGPath &f ) {
if ( file_name.extension() == "zip" ) { if ( file_name.extension() == "zip" ) {
// extract the .zip file to /tmp and point the file name // extract the .zip file to /tmp and point the file name
// to the extracted file // to the extracted file
SGPath tmp_dir = tempnam( 0, "hgt" ); SGPath tmp_dir = string( tempnam( 0, "hgt" ) );
tmp_dir.append( "dummy" ); tmp_dir.append( "dummy" );
tmp_dir.create_dir( 0700 ); tmp_dir.create_dir( 0700 );
cout << "Extracting " << file_name.str() << " to " << tmp_dir.dir() << endl; cout << "Extracting " << file_name.str() << " to " << tmp_dir.dir() << endl;

1
src/Prep/DemChop/.gitignore vendored
View file

@ -1,4 +1,5 @@
demchop demchop
fillvoids fillvoids
hgtchop hgtchop
srtmchop
testassem testassem

11
src/Prep/DemChop/Makefile.am
View file

@ -23,7 +23,10 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
bin_PROGRAMS = demchop hgtchop srtmchop fillvoids testassem bin_PROGRAMS = demchop hgtchop fillvoids testassem
if HAVE_LIBTIFF
bin_PROGRAMS+=srtmchop
endif
demchop_SOURCES = \ demchop_SOURCES = \
demchop.cxx point2d.hxx demchop.cxx point2d.hxx
@ -38,16 +41,18 @@ hgtchop_SOURCES = \
hgtchop_LDADD = \ hgtchop_LDADD = \
$(top_builddir)/src/Lib/HGT/libHGT.a \ $(top_builddir)/src/Lib/HGT/libHGT.a \
-lsgbucket -lsgmisc -lsgdebug -lsgxml -lz -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz -lplibul
$(base_LIBS) $(base_LIBS)
if HAVE_LIBTIFF
srtmchop_SOURCES = \ srtmchop_SOURCES = \
srtmchop.cxx point2d.hxx srtmchop.cxx point2d.hxx
srtmchop_LDADD = \ srtmchop_LDADD = \
$(top_builddir)/src/Lib/HGT/libHGT.a \ $(top_builddir)/src/Lib/HGT/libHGT.a \
-lsgbucket -lsgmisc -lsgdebug -lsgxml -lz -lsgbucket -lsgmisc -lsgdebug -lsgxml -lz -lplibul -ltiff
$(base_LIBS) $(base_LIBS)
endif
fillvoids_SOURCES = \ fillvoids_SOURCES = \
fillvoids.cxx fillvoids.cxx

2
src/Prep/DemChop/srtmchop.cxx
View file

@ -168,7 +168,7 @@ bool TGSrtmTiff::open( const SGPath &f ) {
if ( ext == "zip" ) { if ( ext == "zip" ) {
// extract the .zip file to /tmp and point the file name // extract the .zip file to /tmp and point the file name
// to the extracted file // to the extracted file
SGPath tmp_dir = tempnam( 0, "hgt" ); SGPath tmp_dir = string( tempnam( 0, "hgt" ) );
tmp_dir.append( "dummy" ); tmp_dir.append( "dummy" );
tmp_dir.create_dir( 0700 ); tmp_dir.create_dir( 0700 );
cout << "Extracting " << file_name.str() << " to " << tmp_dir.dir() << endl; cout << "Extracting " << file_name.str() << " to " << tmp_dir.dir() << endl;