From 56e16c5bf3373c1c9beecb50f243732b7721e3d6 Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Tue, 15 Apr 2014 15:29:24 -0500 Subject: [PATCH] Fixes to allow building on windows-x64 --- andorApp/src/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/andorApp/src/Makefile b/andorApp/src/Makefile index 9ed22a2..5094324 100755 --- a/andorApp/src/Makefile +++ b/andorApp/src/Makefile @@ -6,12 +6,13 @@ 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 + LIB_SRCS_WIN32 += shamrock.cpp + LIB_LIBS += ATMCD32M else ifeq (windows-x64, $(findstring windows-x64, $(T_A))) -LIB_LIBS += atmcd64m + LIB_LIBS += atmcd64m + LIB_SRCS += shamrockDummy.cpp endif DATA+=GREY.PAL