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

win32-x86 library was renamed by Andor to be lowercase; add shamrock library for Linux

Browse Source
This commit is contained in:
Mark Rivers
2014-11-18 12:39:55 -06:00
parent d74304b5bb
commit 824c3fd7cb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
andorSupport/Makefile
+5 -1
View File
@@ -14,7 +14,7 @@ INC += atmcdLXd.h
INC += ShamrockCIF.h
ifeq (win32-x86, $(findstring win32-x86, $(T_A)))
LIB_INSTALLS_WIN32 += ../os/win32-x86/ATMCD32M.lib
LIB_INSTALLS_WIN32 += ../os/win32-x86/atmcd32m.lib
LIB_INSTALLS_WIN32 += ../os/win32-x86/ShamrockCIFm.lib
else ifeq (windows-x64, $(findstring windows-x64, $(T_A)))
@@ -24,10 +24,14 @@ LIB_INSTALLS_WIN32 += ../os/windows-x64/ShamrockCIFm.lib
else ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so.2
LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so
LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrock.so.2
LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrock.so
else ifeq (linux-x86, $(findstring linux-x86, $(T_A)))
LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so.2
LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so
LIB_INSTALLS_Linux += ../os/linux-x86/libshamrock.so.2
LIB_INSTALLS_Linux += ../os/linux-x86/libshamrock.so
endif