From c07d0c2d2f6f7b0eb6e92cc6204bf05037957e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 1 Sep 2014 15:43:52 +0200
Subject: Imported Upstream version 1.6.3

---
 spectro/Jamfile | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

(limited to 'spectro/Jamfile')

diff --git a/spectro/Jamfile b/spectro/Jamfile
index 87dee2f..b5ad548 100644
--- a/spectro/Jamfile
+++ b/spectro/Jamfile
@@ -10,13 +10,16 @@ if $(OS) = MACOSX {
 	ObjectCcFlags dispwin_dispwin : -ObjC ;
 }
 
+MADVRSOURCE = ;
+
 # Setup the right hardware access libraries
 if $(NT) {
-	if $(USE_NATIVE_USB)  = true {
-		DEFINES += NATIVE_USB ;
-		LIBUSBHDRS = ../usb/driver ;	# libusb-win32 kernel driver info
-	} else {
+	MADVRSOURCE = madvrwin.c ;
+
+	if $(USE_LIBUSB)  = true {
+		DEFINES += USE_LIBUSB ;
 		if $(USE_LIBUSB1) = true {
+			DEFINES += USE_LIBUSB1 ;
 			LIBUSBDIR = ../libusb1 ;
 			LIBUSBHDRS = ../libusb1 ;
 			if $(MSVCNT) {
@@ -28,19 +31,21 @@ if $(NT) {
 			} else {
 				LIBUSB = $(LIBUSB1NAME)$(SUFLIB) ;
 			}
-			DEFINES += USE_LIBUSB1 ;
 		} else {
 			LIBUSBDIR = ../libusbw ;
 			LIBUSBHDRS = ../libusbw ;
 			LIBUSB = libusb ;
 		}
+	} else {
+		LIBUSBHDRS = ../usb/driver ;	# libusb-win32 kernel driver info
 	}
 }
+
 if $(UNIX) {
-	if $(USE_NATIVE_USB)  = true {
-		DEFINES += NATIVE_USB ;
-	} else {
+	if $(USE_LIBUSB)  = true {
+		DEFINES += USE_LIBUSB ;
 		if $(USE_LIBUSB1) = true {
+			DEFINES += USE_LIBUSB1 ;
 			LIBUSBDIR = ../libusb1 ;
 			LIBUSBHDRS = ../libusb1 ;
 			if $(LIBUSB_IS_DLL) = true {
@@ -49,7 +54,6 @@ if $(UNIX) {
 			} else {
 				LIBUSB = $(LIBUSB1NAME)$(SUFLIB) ;
 			}
-			DEFINES += USE_LIBUSB1 ;
 		} else {
 			LIBUSBDIR = ../libusb ;
 			LIBUSBHDRS = ../libusb ;
@@ -84,12 +88,14 @@ HDRS = ../h ../numlib ../icc ../cgats ../rspl ../xicc ../gamut ../spectro
 # Instrument access library library
 SER_INSTS = dtp22.c dtp41.c dtp51.c ss.c ss_imp.c ;
 
-SER_USB_INSTS = dtp92.c ;
-
 USB_INSTS = dtp20.c i1disp.c i1d3.c i1pro.c i1pro_imp.c
                       munki.c munki_imp.c hcfr.c spyd2.c huey.c
                       colorhug.c usbio.c hidio.c ;
 
+FAST_SER_INSTS = specbos.c ;
+
+SER_USB_INSTS = dtp92.c ;
+
 if $(USE_SERIAL) = true {
 	DEFINES += ENABLE_SERIAL ;
 	INST_SRCS += $(SER_INSTS) ;
@@ -100,15 +106,26 @@ if $(USE_USB) = true {
 	INST_SRCS += $(USB_INSTS) ;
 }
 
+if $(USE_FAST_SERIAL) = true || $(USE_SERIAL) = true {
+	DEFINES += ENABLE_FAST_SERIAL ;
+	INST_SRCS += $(FAST_SER_INSTS) ;
+}
+
 if $(USE_SERIAL) = true || $(USE_USB) = true {
 	INST_SRCS += $(SER_USB_INSTS) ;
 }
 
+if $(USE_DEMOINST) = true && [ GLOB . : demoinst.c ] {
+	echo "Compiling demo instrument support" ;
+	DEFINES += ENABLE_DEMOINST ;
+	INST_SRCS += demoinst.c ;
+}
+
 Library libinst : inst.c insttypes.c icoms.c $(INST_SRCS) ;
 
 # Display access library 
 ObjectKeep mongoose.c ;
-Library libdisp : dispsup.c dispwin.c webwin.c : : : $(LibWinH) : mongoose ;
+Library libdisp : dispsup.c dispwin.c webwin.c $(MADVRSOURCE) : : : $(LibWinH) : mongoose ;
 
 # Instrument types utility functions library. Use this instead of libinst when */
 # applications need to know about different instrument types, but not access them. */
@@ -173,7 +190,7 @@ Main dispread : dispread.c : : : : : libdisp ;
 #display test window test/Lut loader utility
 # [ Could avoid need for libisnt libusb etc.
 #   by separating system dependent utils to a separate library .] 
-MainVariant dispwin : dispwin.c webwin.c : : STANDALONE_TEST : : mongoose : $(LibWin) ;
+MainVariant dispwin : dispwin.c webwin.c $(MADVRSOURCE) : : STANDALONE_TEST : : mongoose : $(LibWin) ;
 
 LINKLIBS = libinsttypes ../xicc/libxicc ../gamut/libgamut ../rspl/librspl
            ../cgats/libcgats ../icc/libicc ../numlib/libnum ../plot/libplot
-- 
cgit v1.2.3