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

Minor reformatting

Browse Source
This commit is contained in:
Mark Rivers
2014-04-15 15:34:29 -05:00
parent 7e8af98608
commit 97e7bae354
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
iocs/andorIOC/andorApp/src/Makefile
View File

@@ -23,15 +23,15 @@ $(PROD_NAME)_SRCS += $(PROD_NAME)_registerRecordDeviceDriver.cpp $(PROD_NAME)Mai
PROD_LIBS += andorCCD
ifeq (win32-x86, $(findstring win32-x86, $(T_A)))
PROD_LIBS += ATMCD32M
PROD_LIBS_WIN32 += ShamrockCIFm
PROD_LIBS += ATMCD32M
PROD_LIBS += ShamrockCIFm
else ifeq (windows-x64, $(findstring windows-x64, $(T_A)))
# Note: we must built the application without GraphicsMagick for windows-x64.
# This is because of a conflict with the Andor library (SetImage function)
# that only occurs on windows-x64.
USE_GRAPHICSMAGICK=NO
PROD_LIBS += atmcd64m
# Note: we must built the application without GraphicsMagick for windows-x64.
# This is because of a conflict with the Andor library (SetImage function)
# that only occurs on windows-x64.
USE_GRAPHICSMAGICK=NO
PROD_LIBS += atmcd64m
endif
# Test application