Changes to build with different DBD file on windows-x64 so only that arch does not use the GraphicsMagick plugin due to name confict on SetImage functions
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14416 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
This commit is contained in:
+16
-6
@@ -10,31 +10,41 @@ LIB_SRCS += andorCCD.cpp
|
||||
|
||||
DATA+=GREY.PAL
|
||||
|
||||
PROD_IOC_WIN32 += andorCCDApp
|
||||
PROD_IOC_Linux += andorCCDApp
|
||||
|
||||
# <name>.dbd will be created from <name>Include.dbd
|
||||
DBD += andorCCDApp.dbd
|
||||
DBD += andorCCDSupport.dbd
|
||||
|
||||
# <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
|
||||
PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
|
||||
# Note: we do things below in an arch-dependent way because 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. So we build all
|
||||
# other archs with commonDriverSupport.dbd, but windows-x64 does not use that.
|
||||
# We have a separate dbd file for windows-x64, and the application has a different name.
|
||||
# We also do default STATIC_BUILD=YES on Windows but dynamic on Linux because Andor only
|
||||
# provides a .so file on Linux.
|
||||
|
||||
# Add locally compiled object code
|
||||
PROD_LIBS += andorCCD
|
||||
|
||||
ifeq (win32-x86, $(findstring win32-x86, $(T_A)))
|
||||
PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
|
||||
PROD_IOC += andorCCDApp
|
||||
PROD_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_LIBS += atmcd64m
|
||||
|
||||
else ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
|
||||
PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
|
||||
PROD_IOC += andorCCDApp
|
||||
PROD_LIBS += andor
|
||||
# Cannot do STATIC_BUILD on Linux because Andor only provides .so file
|
||||
STATIC_BUILD=NO
|
||||
|
||||
else ifeq (linux-x86, $(findstring linux-x86, $(T_A)))
|
||||
PROD_SRCS += andorCCDApp_registerRecordDeviceDriver.cpp andorCCDAppMain.cpp
|
||||
PROD_IOC += andorCCDApp
|
||||
PROD_LIBS += andor
|
||||
STATIC_BUILD=NO
|
||||
|
||||
|
||||
Reference in New Issue
Block a user