From d50d8d903aece161fddd23884a7b6395ad20e2b3 Mon Sep 17 00:00:00 2001 From: rivers Date: Wed, 19 Dec 2012 23:35:35 +0000 Subject: [PATCH] Changed to have USE_GRAPHICSMAGICK=NO on all platforms because the SetImage conflict leads to run-time crashes on Linux git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15775 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/andorSrc/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ADApp/andorSrc/Makefile b/ADApp/andorSrc/Makefile index 5a58519..7a6a10a 100755 --- a/ADApp/andorSrc/Makefile +++ b/ADApp/andorSrc/Makefile @@ -10,12 +10,10 @@ LIB_SRCS += andorCCD.cpp DATA+=GREY.PAL -ifeq (windows-x64, $(findstring windows-x64, $(T_A))) -# Note: we must built the application without GraphicsMagick for windows-x64. +# Note: we must built the application without GraphicsMagick. # This is because of a conflict with the Andor library (SetImage function) -# that only occurs on windows-x64. +# It leads to a build error on windows-x64, but to a run-time error on Linux. USE_GRAPHICSMAGICK=NO -endif PROD_NAME = andorCCDApp PROD_IOC_WIN32 += $(PROD_NAME)