Commit 2a3de81a authored by Laurent Claustre's avatar Laurent Claustre

Merge with Gabriel Jover patch for marccd plugin

parent 75573892
......@@ -196,8 +196,8 @@ endif
ifneq ($(COMPILE_BASLER),0)
BASLER_LDFLAGS := -L. -L/opt/pylon/lib -L/opt/pylon/lib64
BASLER_LDLIBS := -lpylongigesupp
BASLER_LDFLAGS := $(LDFLAGS) -L. -L/opt/pylon/lib -L/opt/pylon/lib64
BASLER_LDLIBS := $(LDLIBS) -lpylongigesupp
basler-name := basler
basler-objs := ../camera/basler/src/Basler.o
......@@ -220,8 +220,8 @@ endif
ifneq ($(COMPILE_UEYE),0)
UEYE_LDFLAGS :=
UEYE_LDLIBS := -lueye_api
UEYE_LDFLAGS := $(LDFLAGS)
UEYE_LDLIBS := $(LDLIBS) -lueye_api
ueye-name := ueye
ueye-objs := ../camera/ueye/src/Ueye.o
......@@ -256,8 +256,8 @@ PROSILICA_LDLIBS := -lPvAPI
prosilica-name := prosilica
prosilica-objs := ../camera/prosilica/src/Prosilica.o
prosilica-ver := ../camera/prosilica/VERSION
prosilica-flags := $(PROSILICA_LDFLAGS)
prosilica-deps := $(PROSILICA_LDLIBS)
prosilica-flags := $(LDFLAGS) $(PROSILICA_LDFLAGS)
prosilica-deps := $(LDLIBS) $(PROSILICA_LDLIBS)
$(call lib-full,$(prosilica-name),$(prosilica-ver)): $(prosilica-objs)
$(call compile-lib,$(prosilica-name),$(prosilica-ver),\
......@@ -275,7 +275,7 @@ endif
ifneq ($(COMPILE_ROPERSCIENTIFIC),0)
ROPERSCIENTIFIC_LDLIBS := -lpvcam -lraw1394
ROPERSCIENTIFIC_LDLIBS := $(LDLIBS) -lpvcam -lraw1394
ropersci-name := roperscientific
ropersci-objs := ../camera/roperscientific/src/RoperScientific.o
......@@ -299,8 +299,8 @@ endif
ifneq ($(COMPILE_ADSC),0)
ADSC_LDFLAGS := -L. -L../camera/adsc/sdk/adsc_sources/lib/linux
ADSC_LDLIBS := -lauxlib -ldetcon_th
ADSC_LDFLAGS := $(LDFLAGS) -L. -L../camera/adsc/sdk/adsc_sources/lib/linux
ADSC_LDLIBS := $(LDLIBS) -lauxlib -ldetcon_th
adsc-name := adsc
adsc-objs := ../camera/adsc/src/Adsc.o
......@@ -324,7 +324,7 @@ endif
ifneq ($(COMPILE_MYTHEN),0)
MYTHEN_LDLIBS := -lSlsDetector
MYTHEN_LDLIBS := $(LDLIBS) -lSlsDetector
mythen-name := mythen
mythen-objs := ../camera/mythen/src/Mythen.o
......@@ -348,8 +348,8 @@ endif
ifneq ($(COMPILE_ANDOR),0)
ANDOR_LDFLAGS := -L. -L/usr/local/lib
ANDOR_LDLIBS := -landor
ANDOR_LDFLAGS := $(LDFLAGS) -L. -L/usr/local/lib
ANDOR_LDLIBS := $(LDLIBS) -landor
andor-name := andor
andor-objs := ../camera/andor/src/Andor.o
......@@ -366,6 +366,29 @@ build_targets += $(call lib-full,$(andor-name),$(andor-ver))
endif
############################
# LIMA - MARCCD
############################
ifneq ($(COMPILE_MARCCD),0)
MARCCD_LDFLAGS := $(LDFLAGS) -L. -L../third-party/yat/src/.libs
MARCCD_LDLIBS := $(LDLIBS) -lyat -lrt
marccd-name := marccd
marccd-objs := ../camera/marccd/src/Marccd.o
marccd-ver := ../camera/marccd/VERSION
marccd-flags := $(MARCCD_LDFLAGS)
marccd-deps := $(MARCCD_LDLIBS)
$(call lib-full,$(marccd-name),$(marccd-ver)): $(marccd-objs)
$(call compile-lib,$(marccd-name),$(marccd-ver),\
$(marccd-flags),$(marccd-deps),$@,$+)
$(call create-links,$(marccd-name),$(marccd-ver))
build_targets += $(call lib-full,$(marccd-name),$(marccd-ver))
endif
############################
# LIMA - XPAD
......@@ -373,7 +396,7 @@ endif
ifneq ($(COMPILE_XPAD),0)
XPAD_LDLIBS := -L/home/xpix_user/PCI_VALIDATED/trunk/sw/xpci_lib \
XPAD_LDLIBS := $(LDLIBS) -L/home/xpix_user/PCI_VALIDATED/trunk/sw/xpci_lib \
-lxpci_lib -L../third-party/yat/lib/i386/static -lyat
xpad-name := xpad
......
......@@ -88,16 +88,36 @@ ifneq ($(COMPILE_MYTHEN),0)
sub-dirs += mythen
endif
ifndef COMPILE_UEYE
COMPILE_UEYE = 0
endif
ifneq ($(COMPILE_UEYE),0)
sub-dirs += ueye
endif
ifndef COMPILE_ANDOR
COMPILE_ANDOR = 0
endif
ifneq ($(COMPILE_ANDOR),0)
sub-dirs += andor
endif
ifndef COMPILE_XPAD
COMPILE_XPAD = 0
endif
ifneq ($(COMPILE_XPAD),0)
sub-dirs += xpad
endif
ifndef COMPILE_MARCCD
COMPILE_MARCCD = 0
endif
ifneq ($(COMPILE_MARCCD),0)
sub-dirs += marccd
endif
include ../global.inc
......@@ -38,6 +38,7 @@ COMPILE_PERKINELMER=0
COMPILE_ANDOR=0
COMPILE_PHOTONICSCIENCE=0
COMPILE_PCO=0
COMPILE_MARCCD=0
COMPILE_CBF_SAVING=0
COMPILE_NXS_SAVING=0
COMPILE_FITS_SAVING=0
......@@ -46,7 +47,7 @@ export COMPILE_CORE COMPILE_SPS_IMAGE COMPILE_SIMULATOR \
COMPILE_ESPIA COMPILE_FRELON COMPILE_MAXIPIX COMPILE_PILATUS \
COMPILE_BASLER COMPILE_PROSILICA COMPILE_ROPERSCIENTIFIC COMPILE_ADSC \
COMPILE_MYTHEN COMPILE_UEYE COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_MARCCD \
COMPILE_CBF_SAVING COMPILE_NXS_SAVING COMPILE_FITS_SAVING \
COMPILE_PCO \
LINK_STRICT_VERSION
......@@ -151,6 +151,12 @@ XPAD_FULL_VERSION = $(shell cat camera/xpad/VERSION)
INSTALL_XPAD_VDIR = $(INSTALL_XPAD_DIR)/v$(XPAD_FULL_VERSION)
endif
ifneq ($(COMPILE_MARCCD), 0)
INSTALL_MARCCD_DIR = $(INSTALL_PLAT_DIR)/Marccd
MARCCD_FULL_VERSION = $(shell cat camera/marccd/VERSION)
INSTALL_MARCCD_VDIR = $(INSTALL_MARCCD_DIR)/v$(MARCCD_FULL_VERSION)
endif
ifneq ($(COMPILE_SPS_IMAGE),0)
INSTALL_CONFIG_DEFINES += -DWITH_SPS_IMAGE
endif
......@@ -361,3 +367,15 @@ ifneq ($(COMPILE_XPAD), 0)
cp sip/xpad/limaxpad.so $(INSTALL_XPAD_VDIR)
cp camera/xpad/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_MARCCD), 0)
mkdir -p $(INSTALL_MARCCD_VDIR)
cp camera/marccd/python/__init__.py $(INSTALL_MARCCD_DIR)
$(call install_core_dep,$(INSTALL_MARCCD_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimamarccd.so*
cp -d build/liblimamarccd.so.* $(INSTALL_LIB_DIR)
cp -d third-party/yat/src/.libs/libyat.so* $(INSTALL_LIB_DIR)
cp sip/marccd/limamarccd.so $(INSTALL_MARCCD_VDIR)
cp camera/marccd/include/*.h $(INSTALL_INCLUDE_DIR)
endif
......@@ -21,8 +21,10 @@ perkinelmer
andor
xpad
photonicscience
marccd
*.obj
lima*.exp
lima*.lib
*.pyd.manifest
*.pyd
.svn
......@@ -75,6 +75,10 @@ ifneq ($(COMPILE_XPAD), 0)
sip-modules += xpad
endif
ifneq ($(COMPILE_MARCCD), 0)
sip-modules += marccd
endif
all: src
src:
......
......@@ -42,6 +42,7 @@ modules = [('core', ['common', 'hardware', 'control']),
('perkinelmer', [os.path.join('camera','perkinelmer')]),
('andor', [os.path.join('camera','andor')]),
('xpad', [os.path.join('camera','xpad')]),
('marccd', [os.path.join('camera','marccd')]),
('photonicscience', [os.path.join('camera','photonicscience')]),
]
......@@ -152,6 +153,9 @@ def main():
extraIncludes += ['../../third-party/yat/include','/home/xpix_user/PCI_VALIDATED/trunk/sw/xpci_lib']
elif(modName == 'pco'):
extraIncludes += ['R:/bliss/projects/LIMA/package/WIN32/PCO/sdkPco/include']
elif(modName == 'marccd'):
extraIncludes += ['../../../include/DiffractionImage']
extraIncludes += ['../../third-party/yat/include']
extraIncludes += findModuleIncludes(modName)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment