From 33a9799b3dfbcb5e16381250c4c985e6f3bd5378 Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Tue, 18 Nov 2014 14:19:49 -0600 Subject: [PATCH] Fixed problem building dynamically on win32-x86 --- andorApp/src/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/andorApp/src/Makefile b/andorApp/src/Makefile index 6e197c1..3db7b40 100755 --- a/andorApp/src/Makefile +++ b/andorApp/src/Makefile @@ -7,7 +7,11 @@ LIBRARY_IOC_WIN32 += andorCCD LIBRARY_IOC_Linux += andorCCD LIB_SRCS += andorCCD.cpp LIB_SRCS += shamrock.cpp +ifeq (win32-x86, $(findstring win32-x86, $(T_A))) +LIB_LIBS_WIN32 += atmcd32m +else ifeq (windows-x64, $(findstring windows-x64, $(T_A))) LIB_LIBS_WIN32 += atmcd64m +endif LIB_LIBS_WIN32 += ShamrockCIFm DATA+=GREY.PAL