From bda4eb8c67f56b0631c5fc64c90f7a33bc31e850 Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Tue, 18 Nov 2014 12:43:57 -0600 Subject: [PATCH] Library renamed to lowercase on win32-x86; link with shamrock on Linux, now have required library --- iocs/andorIOC/andorApp/src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iocs/andorIOC/andorApp/src/Makefile b/iocs/andorIOC/andorApp/src/Makefile index 7954157..5a67e88 100755 --- a/iocs/andorIOC/andorApp/src/Makefile +++ b/iocs/andorIOC/andorApp/src/Makefile @@ -23,7 +23,7 @@ $(PROD_NAME)_SRCS += $(PROD_NAME)_registerRecordDeviceDriver.cpp $(PROD_NAME)Mai PROD_LIBS += andorCCD ifeq (win32-x86, $(findstring win32-x86, $(T_A))) - PROD_LIBS += ATMCD32M + PROD_LIBS += atmcd32m else ifeq (windows-x64, $(findstring windows-x64, $(T_A))) # Note: we must built the application without GraphicsMagick for windows-x64. @@ -42,6 +42,7 @@ PROD_LIBS_WIN32 += ShamrockCIFm # 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 +PROD_SYS_LIBS_Linux += shamrock include $(ADCORE)/ADApp/commonDriverMakefile