Commit aa920d05 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: More NAIF DSK support not checked in yesterday. References #2035 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6095 41f8697f-d340-4b68-9986-7bafba869bb8
parent ebb306ce

isis/make/config.darwin-10.10

+4 −3
Original line number Diff line number Diff line
@@ -170,11 +170,11 @@ TIFFLIBDIR = -L$(ISIS3OPT)/lib 
TIFFLIB    = -ltiff



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

# Set up for naif

# Set up for naif dsk and cspice libraries

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

NAIFINCDIR = -I$(ISIS3LOCAL)/include

NAIFINCDIR = -I$(ISIS3LOCAL)/include/naif/dsklib -I$(ISIS3LOCAL)/include/naif/

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -lcspice

NAIFLIB    = -ldsklib -lcspice



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

# Set up for TNT
@@ -293,6 +293,7 @@ THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtWebKit.framework" 
THIRDPARTYLIBS    += "$(QTFRAMEWORKDIR)/QtOpenGL.framework"

THIRDPARTYLIBS    += "$(QTFRAMEWORKDIR)/QtTest.framework"

THIRDPARTYLIBS    += "$(QWTFRAMES)/qwt.framework"

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

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

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

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

isis/make/config.darwin-10.5

+4 −3
Original line number Diff line number Diff line
@@ -135,11 +135,11 @@ TIFFLIBDIR = -L$(ISIS3OPT)/lib 
TIFFLIB    = -ltiff



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

# Set up for naif

# Set up for naif dsk and cspice libraries

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

NAIFINCDIR = -I$(ISIS3LOCAL)/include

NAIFINCDIR = -I$(ISIS3LOCAL)/include/naif/dsklib -I$(ISIS3LOCAL)/include/naif/

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -lcspice

NAIFLIB    = -ldsklib -lcspice



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

# Set up for TNT
@@ -248,6 +248,7 @@ THIRDPARTYLIBS += "$(QTDIR)/libexec/qt4-mac/lib/QtSvg.framework" 
THIRDPARTYLIBS    += "$(QTDIR)/libexec/qt4-mac/lib/QtWebKit.framework"

THIRDPARTYLIBS    += "$(QTDIR)/libexec/qt4-mac/lib/QtOpenGL.framework"

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

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

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

#THIRDPARTYLIBS   += "$(ISIS3LOCAL)/lib/libsuperlu_3.0.dylib"

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

isis/make/config.darwin-10.6

+4 −3
Original line number Diff line number Diff line
@@ -168,11 +168,11 @@ TIFFLIBDIR = -L$(ISIS3OPT)/lib 
TIFFLIB    = -ltiff



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

# Set up for naif

# Set up for naif dsk and cspice libraries

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

NAIFINCDIR = -I$(ISIS3LOCAL)/include

NAIFINCDIR = -I$(ISIS3LOCAL)/include/naif/dsklib -I$(ISIS3LOCAL)/include/naif/

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -lcspice

NAIFLIB    = -ldsklib -lcspice



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

# Set up for TNT
@@ -291,6 +291,7 @@ THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtWebKit.framework" 
THIRDPARTYLIBS    += "$(QTFRAMEWORKDIR)/QtOpenGL.framework"

THIRDPARTYLIBS    += "$(QTFRAMEWORKDIR)/QtTest.framework"

THIRDPARTYLIBS    += "$(QWTFRAMES)/qwt.framework"

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

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

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

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

isis/make/config.darwin-10.8

+4 −3
Original line number Diff line number Diff line
@@ -170,11 +170,11 @@ TIFFLIBDIR = -L$(ISIS3OPT)/lib 
TIFFLIB    = -ltiff



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

# Set up for naif

# Set up for naif dsk and cspice libraries

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

NAIFINCDIR = -I$(ISIS3LOCAL)/include

NAIFINCDIR = -I$(ISIS3LOCAL)/include/naif/dsklib -I$(ISIS3LOCAL)/include/naif/

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -lcspice

NAIFLIB    = -ldsklib -lcspice



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

# Set up for TNT
@@ -293,6 +293,7 @@ THIRDPARTYLIBS += "$(QTFRAMEWORKDIR)/QtWebKit.framework" 
THIRDPARTYLIBS    += "$(QTFRAMEWORKDIR)/QtOpenGL.framework"

THIRDPARTYLIBS    += "$(QTFRAMEWORKDIR)/QtTest.framework"

THIRDPARTYLIBS    += "$(QWTFRAMES)/qwt.framework"

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

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

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

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

isis/make/config.linux-x86_32

+4 −3
Original line number Diff line number Diff line
@@ -119,11 +119,11 @@ TIFFLIBDIR = -L$(ISIS3LOCAL)/lib 
TIFFLIB    = -ltiff



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

# Set up for naif

# Set up for naif dsk and cspice libraries

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

NAIFINCDIR = -I$(ISIS3LOCAL)/include/naif/cspice63

NAIFINCDIR = -I$(ISIS3LOCAL)/include/naif/cspice64/naif/dsklib -I$(ISIS3LOCAL)/include/naif/cspice64/naif

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -lcspice

NAIFLIB    = -ldsklib -lcspice



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

# Set up for TNT
@@ -238,6 +238,7 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libqwt.so*" 
THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libprotobuf.so*"

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

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

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

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

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libsuperlu_3.0.a"

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