Commit 0ab01f57 authored by Kris Becker's avatar Kris Becker
Browse files

Changes committed for NAIF N0066 upgrade: All build configurations have the... 

Changes committed for NAIF N0066 upgrade: All build configurations have the DSK alpha support removed as its a formal part of the NAIF release; NAIF DSK alpha include files have beeen removed from source files. Fixes #4947.

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

isis/make/config.darwin-10.5

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



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

# Set up for naif dsk and cspice libraries

# Set up for naif cspice libraries. Update for N0066 release (KJB 2017-06-28)

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

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

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

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -ldsklib -lcspice

NAIFLIB    = -lcspice



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

# Set up for TNT
@@ -271,7 +271,6 @@ 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-MacOSX10_10

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



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

# Set up for naif dsk and cspice libraries

# Set up for naif cspice libraries. Update for N0066 Release (KJB 2017-06-28)

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

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

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

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -ldsklib -lcspice

NAIFLIB    = -lcspice



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

# Set up for TNT
@@ -325,7 +325,6 @@ 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-MacOSX10_11

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



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

# Set up for naif dsk and cspice libraries

# Set up for naif cspice libraries. Update for N0066 Release (KJB 2017-06-28)

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

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

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

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -ldsklib -lcspice

NAIFLIB    = -lcspice



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

# Set up for TNT
@@ -416,7 +416,6 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libsnappy.*dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libwebp*.dylib"

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



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

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

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

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

isis/make/config.darwin-MacOSX10_6

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



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

# Set up for naif dsk and cspice libraries

# Set up for naif cspice libraries. Update for N0066 Release (KJB 2017-06-28)

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

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

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

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -ldsklib -lcspice

NAIFLIB    = -lcspice



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

# Set up for TNT
@@ -330,7 +330,6 @@ 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-MacOSX10_8

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



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

# Set up for naif dsk and cspice libraries

# Set up for naif cspice libraries. Update for N0066 Release. (KJB 2017-06-28)

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

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

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

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -ldsklib -lcspice

NAIFLIB    = -lcspice



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

# Set up for TNT
@@ -334,7 +334,6 @@ 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"