lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed to have USE_GRAPHICSMAGICK=NO on all platforms because the SetImage conflict leads to run-time crashes on Linux

Browse Source 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15775 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
This commit is contained in:
rivers
2012-12-19 23:35:35 +00:00
parent 2aadc6e8dd
commit d50d8d903a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ADApp/andorSrc/Makefile
+2 -4
View File
@@ -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)