From 78634a869a7d965d618252b7b25fccef6a636073 Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Sun, 13 Apr 2014 11:27:02 -0500 Subject: [PATCH] Use shamrockSupport.dbd only on Windows; built test application (commented out) --- iocs/andorIOC/andorApp/src/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/iocs/andorIOC/andorApp/src/Makefile b/iocs/andorIOC/andorApp/src/Makefile index 2d483c4..4f9d723 100755 --- a/iocs/andorIOC/andorApp/src/Makefile +++ b/iocs/andorIOC/andorApp/src/Makefile @@ -15,9 +15,11 @@ PROD_IOC_Linux += $(PROD_NAME) # .dbd will be created from Include.dbd DBD += $(PROD_NAME).dbd $(PROD_NAME)_DBD += andorCCDSupport.dbd -$(PROD_NAME)_DBD_WIN32 += shamrockSupport.dbd +ifeq (WIN32, $(OS_CLASS)) + $(PROD_NAME)_DBD += shamrockSupport.dbd +endif -PROD_SRCS += $(PROD_NAME)_registerRecordDeviceDriver.cpp $(PROD_NAME)Main.cpp +$(PROD_NAME)_SRCS += $(PROD_NAME)_registerRecordDeviceDriver.cpp $(PROD_NAME)Main.cpp # Add locally compiled object code PROD_LIBS += andorCCD @@ -34,6 +36,11 @@ USE_GRAPHICSMAGICK=NO PROD_LIBS += atmcd64m endif +# Test application +#PROD_IOC_WIN32 += test_xml +#PROD_IOC_Linux += test_xml +#test_xml += test_xml.cpp + # Note: we use PROD_SYS_LIBS because we are building statically but this library is only provided in dynamic # format (.so) PROD_SYS_LIBS_Linux += andor