Library renamed to lowercase on win32-x86; build shamrock on Linux, n…

…ow have required library
areaDetector · Nov 18, 2014 · a302de5 · a302de5
1 parent 824c3fd
commit a302de5
Showing 1 changed file with 2 additions and 7 deletions.
diff --git 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