Commit 87e99a64 authored by Stuart Sides's avatar Stuart Sides
Browse files

Merged trunk back in 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/isis3NewHorizons@5957 41f8697f-d340-4b68-9986-7bafba869bb8
parents d77ba45c 43efaf59

isis/make/config.darwin-10.6

+19 −1
Original line number Diff line number Diff line
@@ -146,10 +146,24 @@ XERCESLIB = -lxerces-c 


XALAN        = $(ISIS3OPT)/bin/Xalan



#---------------------------------------------------------------------------

# Set up for GeoTiff

#---------------------------------------------------------------------------

GEOTIFFINCDIR = -I$(ISIS3OPT)/include

GEOTIFFLIBDIR = -L$(ISIS3OPT)/lib

GEOTIFFLIB    = -lgeotiff



#---------------------------------------------------------------------------

# Set up for proj (Needed on Macs for geotiff)

#---------------------------------------------------------------------------

PROJINCDIR = -I$(ISIS3OPT)/include

PROJLIBDIR = -L$(ISIS3OPT)/lib

PROJLIB    = -lproj



#---------------------------------------------------------------------------

# Set up for Tiff

#---------------------------------------------------------------------------

TIFFINCDIR = -I$(ISIS3OPT)/include/tiff

TIFFINCDIR = -I$(ISIS3OPT)/include

TIFFLIBDIR = -L$(ISIS3OPT)/lib

TIFFLIB    = -ltiff
@@ -282,6 +296,7 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libsuperlu*.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libprotobuf*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libiconv*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libxerces-c*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libgeotiff*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libtiff*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/liblzma*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libgsl*.dylib"
@@ -309,6 +324,9 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libicui18n*.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libicuuc*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libicudata*.dylib"



# libgeotiff depends on these libraries

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libproj*.dylib"



#  Plugins

THIRDPARTYPLUGINS +=  "$(ISIS3OPT)/share/qt4/plugins/"

isis/make/config.darwin-10.8

+19 −1
Original line number Diff line number Diff line
@@ -148,10 +148,24 @@ XERCESLIB = -lxerces-c 


XALAN        = $(ISIS3OPT)/bin/Xalan



#---------------------------------------------------------------------------

# Set up for GeoTiff

#---------------------------------------------------------------------------

GEOTIFFINCDIR = -I$(ISIS3OPT)/include

GEOTIFFLIBDIR = -L$(ISIS3OPT)/lib

GEOTIFFLIB    = -lgeotiff



#---------------------------------------------------------------------------

# Set up for proj (Needed on Macs for geotiff)

#---------------------------------------------------------------------------

PROJINCDIR = -I$(ISIS3OPT)/include

PROJLIBDIR = -L$(ISIS3OPT)/lib

PROJLIB    = -lproj



#---------------------------------------------------------------------------

# Set up for Tiff

#---------------------------------------------------------------------------

TIFFINCDIR = -I$(ISIS3OPT)/include/tiff

TIFFINCDIR = -I$(ISIS3OPT)/include

TIFFLIBDIR = -L$(ISIS3OPT)/lib

TIFFLIB    = -ltiff
@@ -284,6 +298,7 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libsuperlu*.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libprotobuf*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libiconv*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libxerces-c*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libgeotiff*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libtiff*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/liblzma*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libgsl*.dylib"
@@ -312,6 +327,9 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libicui18n*.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libicuuc*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libicudata*.dylib"



# libgeotiff depends on these libraries

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libproj*.dylib"



#  Plugins

THIRDPARTYPLUGINS +=  "$(ISIS3OPT)/share/qt4/plugins/"

isis/make/config.linux-x86_64

+8 −0
Original line number Diff line number Diff line
@@ -115,6 +115,13 @@ XERCESINCDIR = -I$(ISIS3LOCAL)/include/xercesc/xercesc-3.1.1 
XERCESLIBDIR = -L$(ISIS3LOCAL)/lib

XERCESLIB    = -lxerces-c



#---------------------------------------------------------------------------

# Set up for geotiff 

#---------------------------------------------------------------------------

GEOTIFFINCDIR = -I$(ISIS3LOCAL)/include/geotiff

GEOTIFFLIBDIR = -L$(ISIS3LOCAL)/lib

GEOTIFFLIB    = -lgeotiff



#---------------------------------------------------------------------------

# Set up for Tiff 

#---------------------------------------------------------------------------
@@ -299,6 +306,7 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/liblapack.so" 
THIRDPARTYLIBS    += "$(ISIS3SYSLIB)/libblas*.so*"

THIRDPARTYLIBS    += "$(ISIS3ALTSYSLIB)/libgfortran.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libxerces-c*.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libgeotiff*.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libtiff*.so*"

THIRDPARTYLIBS    += "$(ISIS3SYSLIB)/libgsl*.so*"

#THIRDPARTYLIBS    += "$(ISIS3SYSLIB)/libicuuc.so*"

isis/make/isismake.objs

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ unitTest: $(OBJS) unitTest.o 
	    $(CP) $(ISISROOT)/lib/libisis$(ISISLIBVERSION).a.csmes                   \

	      libisis$(ISISLIBVERSION).a.csmes;                                      \

	  fi;                                                                        \

	  $(AR) $(ISISARFLAGS) -rs libisis$(ISISLIBVERSION).a $(OBJS);               \

	  $(AR) $(ISISARFLAGS) -crs libisis$(ISISLIBVERSION).a $(OBJS);               \

	  $(RANLIB) libisis$(ISISLIBVERSION).a;                                      \

	  $(LDSHARED) $(ISISSHAREDFLAGS) $(ISISSHAREDON)                             \

	      -o libisis$(ISISLIBVERSION).$(SHAREDLIBEXT) libisis$(ISISLIBVERSION).a \

isis/make/isismake.os

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ ALLINCDIRS += $(CWDINCDIR) 
ALLINCDIRS += $(QTINCDIR) 

ALLINCDIRS += $(QWTINCDIR) 

ALLINCDIRS += $(XERCESINCDIR) 

ALLINCDIRS += $(GEOTIFFINCDIR) 

ALLINCDIRS += $(TIFFINCDIR) 

ALLINCDIRS += $(NAIFINCDIR) 

ALLINCDIRS += $(TNTINCDIR)
@@ -131,6 +132,7 @@ ALLLIBDIRS += $(ISISLIBDIR) 
ALLLIBDIRS += $(QTLIBDIR) 

ALLLIBDIRS += $(QWTLIBDIR) 

ALLLIBDIRS += $(XERCESLIBDIR) 

ALLLIBDIRS += $(GEOTIFFLIBDIR) 

ALLLIBDIRS += $(TIFFLIBDIR) 

ALLLIBDIRS += $(NAIFLIBDIR)

ALLLIBDIRS += $(TNTLIBDIR)
@@ -153,6 +155,7 @@ ALLLIBS += $(XTRALIBS) 
ALLLIBS += $(QTLIB) 

ALLLIBS += $(QWTLIB) 

ALLLIBS += $(XERCESLIB)

ALLLIBS += $(GEOTIFFLIB)

ALLLIBS += $(TIFFLIB)

ALLLIBS += $(NAIFLIB) 

ALLLIBS += $(TNTLIB)