diff -uNr argyllcms-0.70.orig/cgats/Jamfile argyllcms-0.70/cgats/Jamfile
--- argyllcms-0.70.orig/cgats/Jamfile 2008-01-16 02:47:37.000000000 +0100
+++ argyllcms-0.70/cgats/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -3,7 +3,7 @@
CCFLAGS += $(CCOPTFLAG) ; # Turn optimisation on
#CCFLAGS += $(CCDEBUGFLAG) ; # Debugging flags
-LINKFLAGS += $(LINKDEBUGFLAG) ;
+LINKFLAGS += -lm $(LINKDEBUGFLAG) ;
#if stdio is not wanted in icclib:
#CCFLAGS += $(DEFFLAG)SEPARATE_STD ;
diff -uNr argyllcms-0.70.orig/gamut/Jamfile argyllcms-0.70/gamut/Jamfile
--- argyllcms-0.70.orig/gamut/Jamfile 2008-01-16 02:47:39.000000000 +0100
+++ argyllcms-0.70/gamut/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -6,7 +6,7 @@
CCFLAGS += $(CCOPTFLAG) ; # Turn optimisation on
#CCFLAGS += $(CCDEBUGFLAG) ; # Debugging flags
#CCFLAGS += $(CCHEAPDEBUG) ; # Heap Debugging flags
-LINKFLAGS += $(LINKDEBUGFLAG) ; # Link with debug info
+LINKFLAGS += -lm $(LINKDEBUGFLAG) ; # Link with debug info
#CCFLAGS += $(CCPROFFLAG) ; # Profile flags
#LINKFLAGS += $(LINKPROFFLAG) ; # Profile flags
diff -uNr argyllcms-0.70.orig/imdi/Jamfile argyllcms-0.70/imdi/Jamfile
--- argyllcms-0.70.orig/imdi/Jamfile 2008-01-16 02:47:45.000000000 +0100
+++ argyllcms-0.70/imdi/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -5,14 +5,16 @@
CCFLAGS += $(CCOPTFLAG) ; # Turn optimisation on
#CCFLAGS += $(CCDEBUGFLAG) ; # Debugging flags
#CCFLAGS += $(CCPROFFLAG) ; # Profile flags
-LINKFLAGS += $(LINKDEBUGFLAG) ; # Link debugging flags
+LINKFLAGS += -lm $(LINKDEBUGFLAG) ; # Link debugging flags
#LINKFLAGS += $(LINKPROFFLAG) ; # Profile flags
#CCFLAGS += $(CCHEAPDEBUG) ; # Heap Debugging flags
if $(HAVE_TIFF) { # Alternate TIFF library
TIFFLIB = ;
TIFFINC = ;
- LINKLIBS on cctiff$(SUFEXE) = -ltiff $(LINKLIBS) ;
+ LINKLIBS on cctiff$(SUFEXE)
+ cctiffo$(SUFEXE)
+ greytiff$(SUFEXE) = -ltiff $(LINKLIBS) ;
} else {
TIFFLIB = ../tiff/libtiff.lib ;
TIFFINC = ../tiff ;
diff -uNr argyllcms-0.70.orig/Jambase argyllcms-0.70/Jambase
--- argyllcms-0.70.orig/Jambase 2008-01-16 02:47:16.000000000 +0100
+++ argyllcms-0.70/Jambase 2008-02-07 20:51:37.000000000 +0100
@@ -259,7 +259,7 @@
FILEMODE default = 644 ;
FORTRAN default = f77 ;
FORTRANFLAGS default = ;
-# HAVE_TIFF default = 1 ;
+ HAVE_TIFF default = 1 ;
HDRS default = ;
INSTALL default = install -c ;
LEX default = lex ;
diff -uNr argyllcms-0.70.orig/link/Jamfile argyllcms-0.70/link/Jamfile
--- argyllcms-0.70.orig/link/Jamfile 2008-01-16 02:47:49.000000000 +0100
+++ argyllcms-0.70/link/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -10,9 +10,9 @@
LINKFLAGS += $(LINKDEBUGFLAG) ; # Link debugging flags
if $(UNIX) && $(OS) != MACOSX {
- WinDir = /usr/X11R6 ;
+ WinDir = /usr ;
LibWinH = $(WinDir)/include/X11 ;
- LibWinD = $(WinDir)/lib ;
+ LibWinD = ;
LibWin = ;
LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
}
diff -uNr argyllcms-0.70.orig/numlib/Jamfile argyllcms-0.70/numlib/Jamfile
--- argyllcms-0.70.orig/numlib/Jamfile 2008-01-16 02:47:17.000000000 +0100
+++ argyllcms-0.70/numlib/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -3,7 +3,7 @@
CCFLAGS += $(CCOPTFLAG) ; # Turn optimisation on
#CCFLAGS += $(CCDEBUGFLAG) ; # Debugging flags
-LINKFLAGS += $(LINKDEBUGFLAG) ;
+LINKFLAGS += -lm $(LINKDEBUGFLAG) ;
#CCFLAGS += $(CCPROFFLAG) ; # Profile flags
#LINKFLAGS += $(LINKPROFFLAG) ; # Profile flags
diff -uNr argyllcms-0.70.orig/numlib/numsup.c argyllcms-0.70/numlib/numsup.c
--- argyllcms-0.70.orig/numlib/numsup.c 2008-01-16 02:47:17.000000000 +0100
+++ argyllcms-0.70/numlib/numsup.c 2008-02-07 20:51:37.000000000 +0100
@@ -5,6 +5,7 @@
#include <stdlib.h>
#include <math.h>
#include <string.h>
+#include <limits.h>
#if defined (NT)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
diff -uNr argyllcms-0.70.orig/plot/Jamfile argyllcms-0.70/plot/Jamfile
--- argyllcms-0.70.orig/plot/Jamfile 2008-01-16 02:47:35.000000000 +0100
+++ argyllcms-0.70/plot/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -6,11 +6,11 @@
LINKFLAGS += $(LINKDEBUGFLAG) ;
if $(UNIX) && $(OS) != MACOSX {
- WinDir = /usr/X11R6 ;
+ WinDir = /usr ;
LibWinH = $(WinDir)/include ;
- LibWinD = $(WinDir)/lib ;
+ LibWinD = ;
LibWin = ;
- LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
+ LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp -lm ;
}
# PLOT library
diff -uNr argyllcms-0.70.orig/profile/Jamfile argyllcms-0.70/profile/Jamfile
--- argyllcms-0.70.orig/profile/Jamfile 2008-01-16 02:47:48.000000000 +0100
+++ argyllcms-0.70/profile/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -11,9 +11,9 @@
LINKFLAGS += -framework IOKit ;
LINKFLAGS += -framework CoreFoundation ;
} else {
- WinDir = /usr/X11R6 ;
+ WinDir = /usr ;
LibWinH = $(WinDir)/include/X11 ;
- LibWinD = $(WinDir)/lib ;
+ LibWinD = ;
LibWin = ;
LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
}
diff -uNr argyllcms-0.70.orig/render/Jamfile argyllcms-0.70/render/Jamfile
--- argyllcms-0.70.orig/render/Jamfile 2008-01-16 02:47:50.000000000 +0100
+++ argyllcms-0.70/render/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -10,6 +10,16 @@
#CCFLAGS += $(CCPROFFLAG) ; # Profile flags
#LINKFLAGS += $(LINKPROFFLAG) ; # Profile flags
+if $(HAVE_TIFF) { # Alternate TIFF library
+ TIFFLIB = ;
+ TIFFINC = ;
+ LINKLIBS on timage$(SUFEXE) = $(LINKLIBS) -ltiff ;
+
+} else {
+ TIFFLIB = ../tiff/libtiff.lib ;
+ TIFFINC = ../tiff ;
+}
+
#Products
Libraries = librender ;
Executables = timage ;
@@ -22,11 +32,11 @@
# 2D Rendering library
Library librender.lib : render.c ;
-ObjectHdrs render$(SUFOBJ) : ../h ../numlib ../tiff ;
+ObjectHdrs render$(SUFOBJ) : ../h ../numlib $(TIFFINC) ;
Main timage : timage.c ;
-ObjectHdrs timage$(SUFOBJ) : ../h ../numlib ../tiff ;
-LinkLibraries timage : librender.lib ../numlib/libnum.lib ../tiff/libtiff.lib ;
+ObjectHdrs timage$(SUFOBJ) : ../h ../numlib $(TIFFINC) ;
+LinkLibraries timage : librender.lib ../numlib/libnum.lib $(TIFFLIB) ;
if $(BUILD_JUNK) {
diff -uNr argyllcms-0.70.orig/rspl/Jamfile argyllcms-0.70/rspl/Jamfile
--- argyllcms-0.70.orig/rspl/Jamfile 2008-01-16 02:47:38.000000000 +0100
+++ argyllcms-0.70/rspl/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -16,9 +16,9 @@
LINKFLAGS += -framework IOKit ;
LINKFLAGS += -framework CoreFoundation ;
} else {
- WinDir = /usr/X11R6 ;
+ WinDir = /usr ;
LibWinH = $(WinDir)/include/X11 ;
- LibWinD = $(WinDir)/lib ;
+ LibWinD = ;
LibWin = ;
LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
}
@@ -28,12 +28,13 @@
if $(HAVE_TIFF) { # Alternate TIFF library
TIFFLIB = ;
- TIFFINC = ;
+ TIFFINC = /usr/include ;
LINKLIBS on c1$(SUFEXE)
c1df$(SUFEXE)
c1i$(SUFEXE)
t2d$(SUFEXE)
t2dfw$(SUFEXE)
+ t2ddf$(SUFEXE)
t3d$(SUFEXE)
t3ddf$(SUFEXE)
tnd$(SUFEXE)
diff -uNr argyllcms-0.70.orig/spectro/Jamfile argyllcms-0.70/spectro/Jamfile
--- argyllcms-0.70.orig/spectro/Jamfile 2008-01-16 02:47:42.000000000 +0100
+++ argyllcms-0.70/spectro/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -17,7 +17,7 @@
if $(UNIX) {
IOFILE = unixio.c pollem.c ;
- LIBUSB = ../libusb ;
+# LIBUSB = ../libusb ;
}
if $(UNIX) {
@@ -25,11 +25,11 @@
LINKFLAGS += -framework IOKit ;
LINKFLAGS += -framework CoreFoundation ;
} else {
- WinDir = /usr/X11R6 ;
+ WinDir = /usr ;
LibWinH = $(WinDir)/include ;
- LibWinD = $(WinDir)/lib ;
+ LibWinD = ;
LibWin = ;
- LINKFLAGS += -L$(LibWinD) -lX11 -lXext -lXxf86vm -lXinerama -lXau -lXdmcp -lXss -ldl ;
+ LINKFLAGS += -L$(LibWinD) -lX11 -lXext -lXxf86vm -lXinerama -lXau -lXdmcp -lXss -ldl -lm -lusb ;
}
}
diff -uNr argyllcms-0.70.orig/spectro/Jamfile.orig argyllcms-0.70/spectro/Jamfile.orig
--- argyllcms-0.70.orig/spectro/Jamfile.orig 1970-01-01 01:00:00.000000000 +0100
+++ argyllcms-0.70/spectro/Jamfile.orig 2008-01-16 02:47:42.000000000 +0100
@@ -0,0 +1,222 @@
+
+#SubDir TOP spectro ;
+
+CCFLAGS += $(CCOPTFLAG) ; # Turn optimisation on
+#CCFLAGS += $(CCDEBUGFLAG) ; # Debugging flags
+LINKFLAGS += $(LINKDEBUGFLAG) ;
+
+if $(NT) {
+ if $(DDK_INC_PATH) && $(DDK_LIB_PATH) { # We can use HID access
+ CCFLAGS += $(DEFFLAG) ENABLE_NT_HID ;
+ HIDLIBS = $(DDK_LIB_PATH)\\hid.lib $(DDK_LIB_PATH)\\setupapi.lib ;
+ HDRS += $(STDHDRS) ; # hack to force search of STDHDRS before DDK
+ }
+ IOFILE = ntio.c ;
+ LIBUSB = ../libusbw ;
+}
+
+if $(UNIX) {
+ IOFILE = unixio.c pollem.c ;
+ LIBUSB = ../libusb ;
+}
+
+if $(UNIX) {
+ if $(OS) = MACOSX {
+ LINKFLAGS += -framework IOKit ;
+ LINKFLAGS += -framework CoreFoundation ;
+ } else {
+ WinDir = /usr/X11R6 ;
+ LibWinH = $(WinDir)/include ;
+ LibWinD = $(WinDir)/lib ;
+ LibWin = ;
+ LINKFLAGS += -L$(LibWinD) -lX11 -lXext -lXxf86vm -lXinerama -lXau -lXdmcp -lXss -ldl ;
+ }
+}
+
+KEEPOBJS = true ; # Jam has trouble with multiple users of .obj
+
+#Products
+Libraries = libinsttypes libinst ;
+Executables = dispwin displin dispread dispcal fakeread synthread chartread spotread spec2cie spyd2en ;
+Headers = inst.h ;
+Samples = ColorChecker.ti2 ECI2002R.ti2 FograStrip.ti2 i1_RGB_Scan_1.4.ti2 SOtele.sp ;
+
+#Install
+InstallBin $(DOTDOT)$(SLASH)bin : $(Executables)$(SUFEXE) ;
+InstallFile $(DOTDOT)$(SLASH)ref : $(Samples) ;
+#InstallFile $(DOTDOT)$(SLASH)h : $(Headers) ;
+#InstallLib $(DOTDOT)$(SLASH)lib : $(Libraries)$(SUFLIB) ;
+
+# Instrument access library library
+Library libinst.lib : inst.c insttypes.c dtp20.c dtp22.c dtp41.c dtp51.c dtp92.c i1disp.c i1pro.c i1pro_imp.c ss.c ss_imp.c hcfr.c spyd2.c huey.c $(IOFILE) usbio.c hidio.c ;
+ObjectHdrs inst insttypes dtp20 dtp22 dtp41 dtp51 dtp92 i1disp i1pro i1pro_imp ss ss_imp hcfr spyd2 huey $(IOFILE) usbio.c hidio.c : . ../h ../numlib ../icc ../rspl ../xicc ../plot $(DDK_INC_PATH) $(LIBUSB) ;
+
+# Instrument types utility functions library. Use this instead of libinst */
+# (hack to re-use insttypes.c in this library)
+Object insttypes_$(SUFOBJ) : insttypes.c ;
+ObjectHdrs insttypes_ : . ../h ../icc ../xicc ;
+LibraryFromObjects libinsttypes.lib : insttypes_$(SUFOBJ) ;
+
+# Support file
+Object alphix$(SUFOBJ) : ../target/alphix.c ;
+ObjectHdrs alphix$(SUFOBJ) : ../h ../numlib ;
+
+# General target reader program
+Object chartread$(SUFOBJ) : chartread.c ;
+ObjectHdrs chartread : . ../h ../cgats ../icc ../numlib ../xicc ../target $(LIBUSB) ;
+MainFromObjects chartread : chartread$(SUFOBJ) alphix$(SUFOBJ) dispsup$(SUFOBJ) dispwin$(SUFOBJ) ;
+LinkLibraries chartread : libinst.lib ../cgats/libcgats.lib
+ ../rspl/librspl.lib
+ ../xicc/libxicc.lib ../xicc/libxcolorants.lib
+ ../numlib/libnum.lib ../icc/libicc.lib
+ ../plot/libplot.lib $(LIBUSB)/libusb.lib
+ $(HIDLIBS) ;
+
+# Printed target spot reader utility
+Object spotread$(SUFOBJ) : spotread.c ;
+ObjectHdrs spotread : . ../h ../cgats ../icc ../numlib ../rspl ../xicc ../gamut
+ ../spectro ../plot $(LIBUSB) ;
+MainFromObjects spotread : spotread$(SUFOBJ) dispsup$(SUFOBJ) dispwin$(SUFOBJ) ;
+LinkLibraries spotread : libinst.lib
+ ../rspl/librspl.lib ../xicc/libxicc.lib
+ ../icc/libicc.lib ../gamut/libgamut.lib ../cgats/libcgats.lib
+ ../plot/libplot.lib ../numlib/libnum.lib
+ $(LIBUSB)/libusb.lib $(LibWin)
+ $(HIDLIBS) ;
+
+# Gretag Spectroscan/T filmstrip reader
+#Object filmread$(SUFOBJ) : filmread.c ;
+#ObjectHdrs filmread : . ../h ../cgats ../icc ../numlib ../xicc $(LIBUSB) ;
+#MainFromObjects filmread : filmread$(SUFOBJ) dispsup$(SUFOBJ) dispwin$(SUFOBJ) ;
+#LinkLibraries filmread : libinst.lib ../cgats/libcgats.lib ../xicc/libxicc.lib
+# ../rspl/librspl.lib
+# ../numlib/libnum.lib ../icc/libicc ../plot/libplot.lib
+# $(LIBUSB)/libusb.lib
+# $(HIDLIBS) ;
+
+# Create linear .cal
+Main displin : displin.c ;
+ObjectHdrs displin : . ../h ../cgats ../numlib ;
+LinkLibraries displin : ../cgats/libcgats.lib ../numlib/libnum.lib ;
+
+# Display calibration program
+Object dispcal$(SUFOBJ) : dispcal.c ;
+ObjectHdrs dispcal dispwin dispsup ../target/ofps : . ../h ../cgats ../icc
+ ../numlib ../rspl ../spectro ../xicc ../spectro ../gamut
+ ../target ../plot $(LIBUSB) $(LibWinH) ;
+MainFromObjects dispcal : dispcal$(SUFOBJ) dispwin$(SUFOBJ) ../target/ofps$(SUFOBJ)
+ dispsup$(SUFOBJ) ;
+LinkLibraries dispcal : libinst.lib ../cgats/libcgats.lib
+ ../rspl/librspl.lib
+ ../xicc/libxicc.lib ../icc/libicc.lib
+ ../rspl/librspl.lib ../numlib/libnum.lib
+ ../gamut/libgamut.lib ../plot/libplot.lib
+ $(LIBUSB)/libusb.lib $(LibWin)
+ $(HIDLIBS) ;
+
+# Display tester program
+Main dispread : dispread.c dispwin.c dispsup.c ;
+ObjectHdrs dispread dispwin dispsup : . ../h ../cgats ../icc ../numlib ../xicc $(LIBUSB) $(LibWinH) ;
+LinkLibraries dispread : libinst.lib ../cgats/libcgats.lib
+ ../rspl/librspl.lib
+ ../xicc/libxicc.lib ../icc/libicc.lib
+ ../numlib/libnum.lib ../plot/libplot.lib
+ $(LIBUSB)/libusb.lib $(LibWin)
+ $(HIDLIBS) ;
+
+
+# ~~~999
+#display test window test/Lut loader utility
+Object sa_dispwin$(SUFOBJ) : dispwin.c ;
+ObjectHdrs sa_dispwin : . ../h ../numlib ../cgats ../icc $(LibWinH) ;
+MainFromObjects dispwin : sa_dispwin$(SUFOBJ) ;
+ObjectCcFlags sa_dispwin.c : -DSTANDALONE_TEST ;
+LinkLibraries dispwin : libinst.lib ../cgats/libcgats.lib
+ ../xicc/libxicc.lib ../icc/libicc.lib
+ ../numlib/libnum.lib ../plot/libplot.lib
+ $(LIBUSB)/libusb.lib $(LibWin)
+ $(HIDLIBS) ;
+
+# Fake device print/read utility using ICC profile
+Main fakeread : fakeread.c ;
+ObjectHdrs fakeread : . ../h ../cgats ../xicc ../spectro ../rspl ../numlib ../gamut ../plot ../icc ;
+LinkLibraries fakeread : libinsttypes.lib ../icc/libicc.lib
+ ../xicc/libxicc.lib ../xicc/libxcolorants.lib
+ ../gamut/libgamut.lib ../cgats/libcgats.lib
+ ../rspl/librspl.lib ../numlib/libnum.lib
+ ../plot/libplot.lib
+ $(LIBUSB)/libusb.lib $(LibWin) ;
+
+# Synthetic device print/read utility
+Main synthread : synthread.c ;
+ObjectHdrs synthread : . ../h ../cgats ../xicc ../spectro ../rspl ../numlib ../gamut ../plot ../icc ;
+LinkLibraries synthread : libinsttypes.lib ../icc/libicc.lib
+ ../xicc/libxicc.lib ../xicc/libxcolorants.lib
+ ../gamut/libgamut.lib ../cgats/libcgats.lib
+ ../rspl/librspl.lib ../numlib/libnum.lib
+ ../plot/libplot.lib
+ $(LIBUSB)/libusb.lib $(LibWin) ;
+
+# Add CIE values to a spectral reading file
+Main spec2cie : spec2cie.c ;
+ObjectHdrs spec2cie : . ../h ../cgats ../xicc ../spectro ../rspl ../numlib ../gamut ../icc ../plot $(LIBUSB) ;
+LinkLibraries spec2cie : libinsttypes.lib ../icc/libicc.lib
+ ../xicc/libxicc.lib ../xicc/libxcolorants.lib
+ ../gamut/libgamut.lib ../numlib/libnum.lib
+ ../cgats/libcgats.lib ../plot/libplot.lib
+ $(LIBUSB)/libusb.lib $(LibWin) ;
+
+# Utility to enable the Spyder 2 instrument */
+Main spyd2en : spyd2en.c vinflate.c ;
+ObjectHdrs spyd2en vinflate : . ../h ../numlib ;
+LinkLibraries spyd2en : ../numlib/libnum.lib ;
+
+# Dumy ti3 file generator for testing
+#Main dumyti3 : dumyti3.c ;
+#ObjectHdrs dumyti3 : . ../h ../cgats ;
+#LinkLibraries dumyti3 : ../cgats/libcgats.lib ;
+
+# Test utility for XYZ matrix spectral correction
+#Main xyzfix : xyzfix.c ;
+#ObjectHdrs xyzfix : . ../h ../numlib ../icc ../cgats ;
+#LinkLibraries xyzfix : ../numlib/libnum.lib ../icc/libicc.lib ../cgats/libcgats.lib ;
+
+# Experimental RAMDAC loader
+# Main vgamma : vgamma.c ;
+
+# fp conversion code test
+#Main fp : fp.c ;
+
+# test code
+#Main tt : tt.c
+#ObjectHdrs tt : . ../numlib ../plot ;
+#LinkLibraries tt : ../numlib/libnum.lib ../plot/libplot.lib ;
+
+if $(OLD_GRETAG) && $(UNIX) && $(OS) != MACOSX {
+
+ # test for parsing a VISE archive
+ Main visetest : visetest.c vinflate.c ;
+ ObjectHdrs visetest vinflate : . ../h ../numlib ;
+ LinkLibraries visetest : ../numlib/libnum.lib ;
+
+ # Compute deconvolution filter for i1pro
+ #Main i1deconv : i1deconv.c ;
+ #ObjectHdrs i1deconv : . ../numlib ../rspl ../plot ;
+ #LinkLibraries i1deconv : ../numlib/libnum.lib ../rspl/librspl.lib ../plot/libplot.lib ;
+
+ # Compute stray light calibration for i1pro
+ #Main i1stray : i1stray.c ;
+ #ObjectHdrs i1stray : . ../numlib ../rspl ../plot ../icc ../xicc ;
+ #LinkLibraries i1stray : ../numlib/libnum.lib ../rspl/librspl.lib ../plot/libplot.lib ;
+
+ # test gretag interface
+ Object gt_gretag$(SUFOBJ) : gretag.c ;
+ ObjectCcFlags gt_gretag.c : -DSTANDALONE_TEST ;
+ ObjectHdrs gt_gretag.c : . ../h ../icc ../xicc ;
+ MainFromObjects gt_test : gt_gretag$(SUFOBJ) spm$(SUFOBJ) $(IOFILE:S=$(SUFOBJ)) ;
+ LinkLibraries gt_test : libinst.lib ../xicc/libxicc.lib ../cgats/libcgats.lib
+ ../icc/libicc.lib $(LIBUSB)/libusb.lib $(LibWin) ;
+ LINKFLAGS on gt_test += -L$(LibWinD) ;
+ LINKLIBS on gt_test += -lglut -lGL -lGLU -lX11 -lXext -lXmu -lXi -lm ;
+}
+
diff -uNr argyllcms-0.70.orig/spectro/Jamfile.rej argyllcms-0.70/spectro/Jamfile.rej
--- argyllcms-0.70.orig/spectro/Jamfile.rej 1970-01-01 01:00:00.000000000 +0100
+++ argyllcms-0.70/spectro/Jamfile.rej 2008-02-07 20:51:37.000000000 +0100
@@ -0,0 +1,42 @@
+***************
+*** 37,43 ****
+
+ #Products
+ Libraries = libinsttypes libinst ;
+- Executables = dispwin displin dispread dispcal fakeread synthread filmread printread spotread spec2cie spyd2en ;
+ Headers = inst.h ;
+ Samples = ColorChecker.ti2 ECI2002R.ti2 FograStrip.ti2 i1_RGB_Scan_1.4.ti2 SOtele.sp ;
+
+--- 37,43 ----
+
+ #Products
+ Libraries = libinsttypes libinst ;
++ Executables = dispwin displin dispread dispcal fakeread synthread printread spotread spec2cie spyd2en ;
+ Headers = inst.h ;
+ Samples = ColorChecker.ti2 ECI2002R.ti2 FograStrip.ti2 i1_RGB_Scan_1.4.ti2 SOtele.sp ;
+
+***************
+*** 84,99 ****
+ $(LIBUSB)/libusb.lib $(LibWin)
+ $(HIDLIBS) ;
+
+- # Gretag Spectroscan/T filmstrip reader
+- Object filmread$(SUFOBJ) : filmread.c ;
+- ObjectHdrs filmread : . ../h ../cgats ../icc ../numlib ../xicc $(LIBUSB) ;
+- MainFromObjects filmread : filmread$(SUFOBJ) dispsup$(SUFOBJ) dispwin$(SUFOBJ) ;
+- LinkLibraries filmread : libinst.lib ../cgats/libcgats.lib ../xicc/libxicc.lib
+- ../rspl/librspl.lib
+- ../numlib/libnum.lib ../icc/libicc ../plot/libplot.lib
+- $(LIBUSB)/libusb.lib
+- $(HIDLIBS) ;
+-
+ # Create linear .cal
+ Main displin : displin.c ;
+ ObjectHdrs displin : . ../h ../cgats ../numlib ;
+--- 84,89 ----
+ $(LIBUSB)/libusb.lib $(LibWin)
+ $(HIDLIBS) ;
+
+ # Create linear .cal
+ Main displin : displin.c ;
+ ObjectHdrs displin : . ../h ../cgats ../numlib ;
diff -uNr argyllcms-0.70.orig/target/Jamfile argyllcms-0.70/target/Jamfile
--- argyllcms-0.70.orig/target/Jamfile 2008-01-16 02:47:45.000000000 +0100
+++ argyllcms-0.70/target/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -14,9 +14,9 @@
LINKFLAGS += -framework IOKit ;
LINKFLAGS += -framework CoreFoundation ;
} else {
- WinDir = /usr/X11R6 ;
+ WinDir = /usr ;
LibWinH = $(WinDir)/include/X11 ;
- LibWinD = $(WinDir)/lib ;
+ LibWinD = ;
LibWin = ;
LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
}
diff -uNr argyllcms-0.70.orig/target/Jamfile.orig argyllcms-0.70/target/Jamfile.orig
--- argyllcms-0.70.orig/target/Jamfile.orig 1970-01-01 01:00:00.000000000 +0100
+++ argyllcms-0.70/target/Jamfile.orig 2008-01-16 02:47:45.000000000 +0100
@@ -0,0 +1,138 @@
+# Print Calibration Target Data File generator
+
+#SubDir TOP target ;
+
+CCFLAGS += $(CCOPTFLAG) ; # Turn optimisation on
+#CCFLAGS += $(CCDEBUGFLAG) ; # Debugging flags
+#CCFLAGS += $(CCPROFFLAG) ; # Profile flags
+#LINKFLAGS += $(LINKPROFFLAG) ; # Profile flags
+#CCFLAGS += $(CCHEAPDEBUG) ; # Heap Debugging flags
+LINKFLAGS += $(LINKDEBUGFLAG) ; # Link debugging flags
+
+if $(UNIX) {
+ if $(OS) = MACOSX {
+ LINKFLAGS += -framework IOKit ;
+ LINKFLAGS += -framework CoreFoundation ;
+ } else {
+ WinDir = /usr/X11R6 ;
+ LibWinH = $(WinDir)/include/X11 ;
+ LibWinD = $(WinDir)/lib ;
+ LibWin = ;
+ LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
+ }
+}
+
+if $(HAVE_TIFF) {
+ TIFFLIB = ;
+ TIFFINC = ;
+ LINKLIBS on targen$(SUFEXE)
+ filmtarg$(SUFEXE) = -ltiff $(LINKLIBS) ;
+} else {
+ TIFFLIB = ../tiff/libtiff.lib ;
+ TIFFINC = ../tiff ;
+}
+
+#Products
+Executables = targen printtarg ;
+
+#Install
+InstallBin $(DOTDOT)$(SLASH)bin : $(Executables)$(SUFEXE) ;
+
+Object alphix$(SUFOBJ) : alphix.c ;
+ObjectHdrs alphix$(SUFOBJ) : ../h ../numlib ;
+
+Object randix$(SUFOBJ) : randix.c ;
+ObjectHdrs randix$(SUFOBJ) : ../h ../numlib ;
+
+#target generator
+Main targen : targen.c ppoint.c ofps.c ifarp.c simplat.c simdlat.c prand.c ;
+ObjectHdrs ppoint$(SUFOBJ) : ../h ../numlib ../plot ../icc ../rspl ../xicc ;
+ObjectHdrs ofps$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
+ObjectHdrs ifarp$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
+ObjectHdrs simplat$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
+ObjectHdrs simdlat$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
+ObjectHdrs prand$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
+ObjectHdrs targen$(SUFOBJ) : ../h ../numlib ../rspl ../cgats ../icc ../gamut ../xicc ../spectro ;
+LinkLibraries targen : ../rspl/librspl.lib ../cgats/libcgats.lib
+ ../icc/libicc.lib ../plot/libplot.lib ../xicc/libxicc.lib
+ ../xicc/libxcolorants.lib ../gamut/libgamut.lib
+ ../numlib/libnum.lib ../spectro/libinsttypes.lib
+ $(LibWin) ;
+
+# Film Calibration Target File generator
+#MainFromObjects filmtarg : filmtarg$(SUFOBJ) alphix$(SUFOBJ) randix$(SUFOBJ) ;
+#Object filmtarg$(SUFOBJ) : filmtarg.c ;
+#ObjectHdrs filmtarg$(SUFOBJ) : ../h ../numlib ../cgats $(TIFFINC) ;
+#LinkLibraries filmtarg : ../cgats/libcgats.lib $(TIFFLIB) ;
+
+# Print Calibration Target Postscrip../numlib t File generator
+MainFromObjects printtarg : printtarg$(SUFOBJ) alphix$(SUFOBJ) randix$(SUFOBJ) ;
+Object printtarg$(SUFOBJ) : printtarg.c ;
+ObjectHdrs printtarg$(SUFOBJ) : ../h ../numlib ../cgats ../spectro ../rspl ../icc ../xicc
+ ../gamut ;
+LinkLibraries printtarg : ../cgats/libcgats.lib ../xicc/libxicc.lib
+ ../xicc/libxcolorants.lib ../icc/libicc.lib
+ ../numlib/libnum.lib ../spectro/libinsttypes.lib
+ ../plot/libplot.lib $(LibWin) ;
+
+# Individual stand alone test of sample point classes
+
+# Percepttual point distribution
+MainFromObjects ppoint : sa_ppoint$(SUFOBJ) ;
+Object sa_ppoint$(SUFOBJ) : ppoint.c ;
+ObjectCcFlags sa_ppoint$(SUFOBJ) : -DSTANDALONE_TEST ;
+ObjectHdrs sa_ppoint$(SUFOBJ) : ../h ../numlib ../plot ../icc ../rspl ../xicc ;
+LinkLibraries ppoint : ../plot/libplot.lib ../rspl/librspl.lib ../numlib/libnum.lib $(LibWin) ;
+
+# Optimised farthest point sampling class
+MainFromObjects ofps : sa_ofps$(SUFOBJ) ;
+Object sa_ofps$(SUFOBJ) : ofps.c ;
+ObjectCcFlags sa_ofps$(SUFOBJ) : -DSTANDALONE_TEST ;
+ObjectHdrs sa_ofps$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
+LinkLibraries ofps : ../numlib/libnum.lib ../plot/libplot.lib $(LibWin) ;
+
+# Incremental far point class
+MainFromObjects ifarp : sa_ifarp$(SUFOBJ) ;
+Object sa_ifarp$(SUFOBJ) : ifarp.c ;
+ObjectCcFlags sa_ifarp$(SUFOBJ) : -DSTANDALONE_TEST ;
+ObjectHdrs sa_ifarp$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
+LinkLibraries ifarp : ../numlib/libnum.lib ../plot/libplot.lib
+ ../xicc/libxcolorants.lib ../icc/libicc.lib $(LibWin) ;
+
+# Perceptual space simplex lattice
+MainFromObjects simplat : sa_simplat$(SUFOBJ) ;
+Object sa_simplat$(SUFOBJ) : simplat.c ;
+ObjectCcFlags sa_simplat$(SUFOBJ) : -DSTANDALONE_TEST ;
+ObjectHdrs sa_simplat$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
+LinkLibraries simplat : ../numlib/libnum.lib ../plot/libplot.lib
+ ../xicc/libxcolorants.lib ../icc/libicc.lib $(LibWin) ;
+
+# Device space simplex lattice
+MainFromObjects simdlat : sa_simdlat$(SUFOBJ) ;
+Object sa_simdlat$(SUFOBJ) : simdlat.c ;
+ObjectCcFlags sa_simdlat$(SUFOBJ) : -DSTANDALONE_TEST ;
+ObjectHdrs sa_simdlat$(SUFOBJ) : ../h ../numlib ../plot ../icc ../xicc ;
+LinkLibraries simdlat : ../numlib/libnum.lib ../plot/libplot.lib
+ ../xicc/libxcolorants.lib ../icc/libicc.lib $(LibWin) ;
+
+if $(BUILD_JUNK) {
+
+ # Test program
+ MainFromObjects test : test$(SUFOBJ) alphix$(SUFOBJ) ;
+ Object test$(SUFOBJ) : test.c ;
+ ObjectHdrs test$(SUFOBJ) : ../h ../numlib ;
+ LinkLibraries test : ../numlib/libnum.lib ;
+
+ # Test program
+ MainFromObjects temp : temp$(SUFOBJ) ;
+ Object temp$(SUFOBJ) : temp.c ;
+ ObjectHdrs temp$(SUFOBJ) : ../h ../numlib ../plot ;
+ LinkLibraries temp : ../numlib/libnum.lib ../plot/libplot.lib $(LibWin) ;
+
+ # Test lmean experiment
+ MainFromObjects lmean : lmean$(SUFOBJ) ;
+ Object lmean$(SUFOBJ) : lmean.c ;
+ ObjectHdrs lmean$(SUFOBJ) : ../h ../numlib ../plot ;
+ LinkLibraries lmean : ../numlib/libnum.lib ../plot/libplot.lib $(LibWin) ;
+
+}
diff -uNr argyllcms-0.70.orig/xicc/Jamfile argyllcms-0.70/xicc/Jamfile
--- argyllcms-0.70.orig/xicc/Jamfile 2008-01-16 02:47:40.000000000 +0100
+++ argyllcms-0.70/xicc/Jamfile 2008-02-07 20:51:37.000000000 +0100
@@ -12,9 +12,9 @@
LINKFLAGS += -framework IOKit ;
LINKFLAGS += -framework CoreFoundation ;
} else {
- WinDir = /usr/X11R6 ;
+ WinDir = /usr ;
LibWinH = $(WinDir)/include/X11 ;
- LibWinD = $(WinDir)/lib ;
+ LibWinD = ;
LibWin = ;
LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
}
@@ -23,7 +23,9 @@
if $(HAVE_TIFF) { # Alternate TIFF library
TIFFLIB = ;
TIFFINC = ;
- LINKLIBS on tiffgamut$(SUFEXE) = $(LINKLIBS) -ltiff ;
+ LINKLIBS on tiffgamut$(SUFEXE)
+ cam02plot$(SUFEXE) = $(LINKLIBS) -ltiff ;
+
} else {
TIFFLIB = ../tiff/libtiff.lib ;
TIFFINC = ../tiff ;