From a0701e9a5adaae198ea5d5aa8e0b4dfc41784a5f Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Sat, 12 Apr 2014 11:30:20 -0500 Subject: [PATCH] Add Shamrock support on Windows --- iocs/andorIOC/andorApp/src/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/iocs/andorIOC/andorApp/src/Makefile b/iocs/andorIOC/andorApp/src/Makefile index 8848602..2d483c4 100755 --- a/iocs/andorIOC/andorApp/src/Makefile +++ b/iocs/andorIOC/andorApp/src/Makefile @@ -15,14 +15,16 @@ 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 PROD_SRCS += $(PROD_NAME)_registerRecordDeviceDriver.cpp $(PROD_NAME)Main.cpp # Add locally compiled object code -PROD_LIBS += andorCCD +PROD_LIBS += andorCCD ifeq (win32-x86, $(findstring win32-x86, $(T_A))) -PROD_LIBS += ATMCD32M +PROD_LIBS += ATMCD32M +PROD_LIBS_WIN32 += ShamrockCIFm else ifeq (windows-x64, $(findstring windows-x64, $(T_A))) # Note: we must built the application without GraphicsMagick for windows-x64.