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

Added commented out lines for tests on Linux; change so all archs use DBD file without GraphicsMagick because of name conflict with SetImage()

Browse Source 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14596 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
This commit is contained in:
rivers
2012-03-06 22:22:53 +00:00
parent b745a27e3d
commit ec8b13fc55
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ADApp/andorSrc/Makefile
View File

@@ -37,9 +37,8 @@ PROD_LIBS += ATMCD32M
#FKTest_LIBS += ATMCD32M
else ifeq (windows-x64, $(findstring windows-x64, $(T_A)))
PROD_SRCS += andorCCDAppWin64_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
DBD += andorCCDAppWin64.dbd
PROD_IOC += andorCCDAppWin64
PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
PROD_IOC += andorCCDApp
PROD_LIBS += atmcd64m
else ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
@@ -47,6 +46,12 @@ PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
PROD_IOC += andorCCDApp
PROD_LIBS += andor
STATIC_BUILD=NO
#PROD_IOC += accumTest
#accumTest_SRCS += accumTest.c
#PROD_IOC += FKTest
#FKTest_SRCS += FKTest.c
#PROD_IOC += linuxTest
#linuxTest_SRCS += linuxTest.c
else ifeq (linux-x86, $(findstring linux-x86, $(T_A)))
PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp