From a302de5424acd944cf9e9f034f97d3c59f423d98 Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Tue, 18 Nov 2014 12:42:37 -0600 Subject: [PATCH] Library renamed to lowercase on win32-x86; build shamrock on Linux, now have required library --- andorApp/src/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/andorApp/src/Makefile b/andorApp/src/Makefile index 50c9b03..6e197c1 100755 --- a/andorApp/src/Makefile +++ b/andorApp/src/Makefile @@ -6,13 +6,8 @@ include $(TOP)/configure/CONFIG LIBRARY_IOC_WIN32 += andorCCD LIBRARY_IOC_Linux += andorCCD LIB_SRCS += andorCCD.cpp -LIB_SRCS_WIN32 += shamrock.cpp -LIB_SRCS_Linux += shamrockDummy.cpp -ifeq (win32-x86, $(findstring win32-x86, $(T_A))) - LIB_LIBS += ATMCD32M -else ifeq (windows-x64, $(findstring windows-x64, $(T_A))) - LIB_LIBS += atmcd64m -endif +LIB_SRCS += shamrock.cpp +LIB_LIBS_WIN32 += atmcd64m LIB_LIBS_WIN32 += ShamrockCIFm DATA+=GREY.PAL