Commit 435423ab authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Updated from trunk 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6686 41f8697f-d340-4b68-9986-7bafba869bb8
parents 89ab8a31 dbcd31c4

isis/IsisPreferences

+2 −2
Original line number Diff line number Diff line
@@ -174,10 +174,10 @@ Group = DataDirectory 
  Mgs          = $ISIS3DATA/mgs

  Mro          = $ISIS3DATA/mro

  Near         = $ISIS3DATA/near

  # When setting this back to the normal area, do not forget objs/Preferences

  NewHorizons  = $ISIS3DATA/../datalocal/newhorizons

  NewHorizons  = $ISIS3DATA/newhorizons

  Odyssey      = $ISIS3DATA/odyssey

  Rolo         = $ISIS3DATA/rolo

  Rosetta      = $ISIS3DATA/rosetta

  Smart1       = $ISIS3DATA/smart1

  Viking1      = $ISIS3DATA/viking1

  Viking2      = $ISIS3DATA/viking2

isis/make/config.darwin-10.5

+27 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ JAMALIB = 
#---------------------------------------------------------------------------

GEOSINCDIR = -I$(ISIS3OPT)/include/geos

GEOSLIBDIR = -L$(ISIS3OPT)/lib

GEOSLIB    = -lgeos

GEOSLIB    = -lgeos -lgeos_c



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

# Set up for the GNU Scientific Library (GSL).  Note that this setup
@@ -233,6 +233,29 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include/CHOLMOD/CHOLMOD1.7.3 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

CHOLMODLIB   = -lcholmod -lamd -lcolamd -framework Accelerate



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

# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3LOCAL)/include

#OPENCVLIBDIR =  -L$(ISIS3LOCAL)/lib   # Redundant

OPENCVLIBS   = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \

               -lopencv_flann -lopencv_gpu -lopencv_highgui -lopencv_imgproc \

               -lopencv_legacy -lopencv_ml -lopencv_nonfree -lopencv_objdetect \

               -lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts \

               -lopencv_video -lopencv_videostab



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

# Set up for Natural Neigbor Library (NN)

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

NNINCDIR = -I$(ISIS3LOCAL)/include/nn

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Final generic setip for includes at the top level

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

DEFAULTINCDIR =  -I$(ISIS3LOCAL)/include



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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -276,6 +299,9 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libcholmod.dylib" 
THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcolamd.dylib"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libufconfig.dylib"

THIRDPARTYLIBS    += "/System/Library/Frameworks/Accelerate.framework"

# Add all the OpenCV libraries

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libopencv_*.dylib"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libtbb*.dylib"



# libxerces-c depends on these libraries

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

isis/make/config.darwin-MacOSX10_10

+28 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ JAMALIB = 
#---------------------------------------------------------------------------

GEOSINCDIR = -I$(ISIS3OPT)/include/geos

GEOSLIBDIR = -L$(ISIS3OPT)/lib

GEOSLIB    = -lgeos

GEOSLIB    = -lgeos -lgeos_c



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

# Set up for the GNU Scientific Library (GSL).  Note that this setup
@@ -287,6 +287,29 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

CHOLMODLIB   = -lcholmod -lamd -lcolamd -lcamd -framework Accelerate



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

# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3OPT)/include

#OPENCVLIBDIR =  -L$(ISIS3OPT)/lib

OPENCVLIBS   = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \

               -lopencv_flann -lopencv_gpu -lopencv_highgui -lopencv_imgproc \

               -lopencv_legacy -lopencv_ml -lopencv_nonfree -lopencv_objdetect \

               -lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts \

               -lopencv_video -lopencv_videostab



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

# Set up for Natural Neigbor Library (NN)

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

NNINCDIR = -I$(ISIS3LOCAL)/include/nn

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Final generic setip for includes at the top level

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

DEFAULTINCDIR =  -I$(ISIS3LOCAL)/include



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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -333,6 +356,10 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libcholmod.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libcolamd.dylib"

THIRDPARTYLIBS    += "/System/Library/Frameworks/Accelerate.framework"

 

# Add all the OpenCV libraries

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

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



# libxerces-c depends on these libraries

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

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

isis/make/config.darwin-MacOSX10_6

+80 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ JAMALIB = 
#---------------------------------------------------------------------------

GEOSINCDIR = -I$(ISIS3OPT)/include/geos

GEOSLIBDIR = -L$(ISIS3OPT)/lib

GEOSLIB    = -lgeos

GEOSLIB    = -lgeos -lgeos_c



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

# Set up for the GNU Scientific Library (GSL).  Note that this setup
@@ -284,6 +284,30 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

CHOLMODLIB   = -lcholmod -lamd -lcolamd -framework Accelerate





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

# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3OPT)/include

##OPENCVLIBDIR =  -L$(ISIS3OPT)/lib   # Redundant

OPENCVLIBS   = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \

               -lopencv_flann -lopencv_gpu -lopencv_highgui -lopencv_imgproc \

               -lopencv_legacy -lopencv_ml -lopencv_nonfree -lopencv_objdetect \

               -lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts \

               -lopencv_video -lopencv_videostab



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

# Set up for Natural Neigbor Library (NN)

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

NNINCDIR = -I$(ISIS3LOCAL)/include/nn

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Final generic setup for includes at the top level

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

DEFAULTINCDIR =  -I$(ISIS3LOCAL)/include



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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -329,6 +353,61 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libcholmod.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libcolamd.dylib"

THIRDPARTYLIBS    += "/System/Library/Frameworks/Accelerate.framework"



# Add all the OpenCV libraries and its dependancies

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

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

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

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

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

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

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

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

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

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

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

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



# Secondary requirements to all OpenCV dependancies (Yuck!)

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

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libSDL-1*.dylib"

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

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

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

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

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

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

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

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

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

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

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

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libschroedinger-1*.dylib"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/liborc-0*.dylib"

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

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

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

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

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

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

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





# libxerces-c depends on these libraries

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

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

isis/make/config.darwin-MacOSX10_8

+83 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ JAMALIB = 
#---------------------------------------------------------------------------

GEOSINCDIR = -I$(ISIS3OPT)/include/geos

GEOSLIBDIR = -L$(ISIS3OPT)/lib

GEOSLIB    = -lgeos

GEOSLIB    = -lgeos -lgeos_c



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

# Set up for the GNU Scientific Library (GSL).  Note that this setup
@@ -287,6 +287,31 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

CHOLMODLIB   = -lcholmod -lamd -lcolamd -lcamd -framework Accelerate





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

# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3OPT)/include

#OPENCVLIBDIR =  -L$(ISIS3OPT)/lib   # Redundant

OPENCVLIBS   = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \

               -lopencv_flann -lopencv_gpu -lopencv_highgui -lopencv_imgproc \

               -lopencv_legacy -lopencv_ml -lopencv_nonfree -lopencv_objdetect \

               -lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts \

               -lopencv_video -lopencv_videostab



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

# Set up for Natural Neigbor Library (NN)

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

NNINCDIR = -I$(ISIS3LOCAL)/include/nn

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Final generic setup for includes at the top level

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

DEFAULTINCDIR =  -I$(ISIS3LOCAL)/include





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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -333,6 +358,63 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libcholmod.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libcolamd.dylib"

THIRDPARTYLIBS    += "/System/Library/Frameworks/Accelerate.framework"



# Add all the OpenCV libraries and its dependancies

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

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

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

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

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

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

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

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

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

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

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

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



# Secondary requirements to all OpenCV dependancies (Yuck!)

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libSDL-1*.dylib"

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

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

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

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

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

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

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

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

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

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

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

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libschroedinger-1*.dylib"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/liborc-0*.dylib"

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

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

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

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

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

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

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

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libp11-kit*.dylib"

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

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





# libxerces-c depends on these libraries

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

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