summaryrefslogtreecommitdiff
path: root/spectro/Jamfile
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-01 10:32:14 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-01 10:32:14 +0100
commit4097e27114d227692d53c5d28487e12a3833cd24 (patch)
treed5c2a62c4db97de94f92150340612c64d3997669 /spectro/Jamfile
parentf8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff)
parent5514d94483c98e3320b202b1bb882023a7d12027 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'spectro/Jamfile')
-rwxr-xr-x[-rw-r--r--]spectro/Jamfile34
1 files changed, 29 insertions, 5 deletions
diff --git a/spectro/Jamfile b/spectro/Jamfile
index 94a2f70..f40ef19 100644..100755
--- a/spectro/Jamfile
+++ b/spectro/Jamfile
@@ -11,6 +11,11 @@ if $(OS) = MACOSX {
ObjectCcFlags dispwin_dispwin : -ObjC ;
}
+if $(USE_CMFM) = true {
+ echo "CMF Measurement device support is enabled" ;
+ DEFINES += ENABLE_CMFM ;
+}
+
if [ GLOB [ NormPaths . ] : fastserio.c ] {
# echo "!!!!!!!!! fastserio.c is enabled !!!!!!!!!" ;
# DEFINES += ENABLE_FTDI ;
@@ -127,6 +132,24 @@ if $(USE_DEMOINST) = true && [ GLOB [ NormPaths . ] : demoinst.c ] {
INST_SRCS += demoinst.c ;
}
+if $(USE_VTPGLUT) = true && [ GLOB [ NormPaths . ] : vtpglut.c ] {
+ echo "Compiling Video Test Pattern Generator and 3DLUT support" ;
+ DEFINES += ENABLE_VTPGLUT ;
+ INST_SRCS += vtpglut.c ;
+}
+
+if $(USE_PRINTERS) = true && [ GLOB [ NormPaths . ] : printers.c ] {
+ echo "Compiling Printer support" ;
+ DEFINES += ENABLE_DEMOINST ;
+ INST_SRCS += printers.c ;
+}
+
+if $(USE_CMFM) = true && [ GLOB [ NormPaths . ] : colvis.c ] {
+ echo "Compiling ColVis support" ;
+ DEFINES += ENABLE_CMFM ;
+ INST_SRCS += colvis.c ;
+}
+
Library libinst : inst.c insttypes.c icoms.c disptechs.c rspec.c xrga.c $(INST_SRCS) ;
# Display access library
@@ -138,7 +161,8 @@ Library libdisp : dispsup.c dispwin.c webwin.c ccwin.c
# applications need to know about different instrument or display types, but not access them. */
# (Note we're working around a bug in Jam caused by objects shared between libraries)
Object insttypes2 : insttypes.c ;
-LibraryFromObjects libinsttypes : insttypes2 ;
+Object xrga2 : xrga.c ;
+LibraryFromObjects libinsttypes : insttypes2 xrga2 ;
Object disptechs2 : disptechs.c ;
LibraryFromObjects libdisptechs : disptechs2 ;
@@ -171,6 +195,8 @@ if $(LIBUSB_IS_DLL) = true {
LINKLIBS += $(LIBUSBDIR)/$(LIBUSB) ;
}
+LINKFLAGS += $(GUILINKFLAGS) ;
+
# General target reader program
Main chartread : chartread.c ../target/alphix.c : : : ../target : : ;
@@ -180,10 +206,8 @@ Main illumread : illumread.c : : : ../target : : ;
# Printed target spot reader utility
Main spotread : spotread.c : : : : : ;
-# Test code
-if $(HOME) = "d:\\usr\\graeme" && $(PWD) = "/src/argyll/spectro" {
- Main setoem : setoem.c : : : : : ../numlib/libui ;
-}
+echo "HOME = " $(HOME) ;
+echo "PWD = " $(PWD) ;
# CCMX and CCSStool
Main ccxxmake : ccxxmake.c : : : : : libdisp ;