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

Library renamed to lowercase on win32-x86; link with shamrock on Linux, now have required library

Browse Source
This commit is contained in:
Mark Rivers
2014-11-18 12:43:57 -06:00
parent b0c6d0c2f0
commit bda4eb8c67
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ $(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 += atmcd32m
else ifeq (windows-x64, $(findstring windows-x64, $(T_A)))
# Note: we must built the application without GraphicsMagick for windows-x64.
@@ -42,6 +42,7 @@ PROD_LIBS_WIN32 += ShamrockCIFm
# Note: we use PROD_SYS_LIBS because we are building statically but this library is only provided in dynamic
# format (.so)
PROD_SYS_LIBS_Linux += andor
PROD_SYS_LIBS_Linux += shamrock
include $(ADCORE)/ADApp/commonDriverMakefile