Added real support for the new camera plugin Xh from Geoff Mant

parent fad69c84
......@@ -398,6 +398,30 @@ build_targets += $(call lib-full,$(marccd-name),$(marccd-ver))
endif
############################
# LIMA - XH
############################
ifneq ($(COMPILE_XH),0)
XH_LDLIBS :=
xh-name := xh
xh-objs := ../camera/xh/src/Xh.o
xh-ver := ../camera/xh/VERSION
xh-flags := $(LDFLAGS)
xh-deps := $(XH_LDLIBS)
$(call lib-full,$(xh-name),$(xh-ver)): $(xh-objs)
$(call compile-lib,$(xh-name),$(xh-ver),\
$(xh-flags),$(xh-deps),$@,$+)
$(call create-links,$(xh-name),$(xh-ver))
build_targets += $(call lib-full,$(xh-name),$(xh-ver))
endif
############################
# LIMA - XPAD
############################
......
......@@ -104,6 +104,10 @@ ifneq ($(COMPILE_ANDOR),0)
sub-dirs += andor
endif
ifneq ($(COMPILE_XH),0)
sub-dirs += xh
endif
ifndef COMPILE_XPAD
COMPILE_XPAD = 0
endif
......
......@@ -33,6 +33,7 @@ COMPILE_ROPERSCIENTIFIC=0
COMPILE_MYTHEN=0
COMPILE_ADSC=0
COMPILE_UEYE=0
COMPILE_XH=0
COMPILE_XPAD=0
COMPILE_PERKINELMER=0
COMPILE_ANDOR=0
......@@ -49,7 +50,7 @@ LINK_STRICT_VERSION=0
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_MYTHEN COMPILE_UEYE COMPILE_XH COMPILE_XPAD COMPILE_PERKINELMER \
COMPILE_ANDOR COMPILE_PHOTONICSCIENCE COMPILE_PCO COMPILE_MARCCD \
COMPILE_POINTGREY COMPILE_CBF_SAVING COMPILE_NXS_SAVING \
COMPILE_FITS_SAVING COMPILE_EDFGZ_SAVING COMPILE_CONFIG\
......
......@@ -145,6 +145,12 @@ ANDOR_FULL_VERSION = $(shell cat camera/andor/VERSION)
INSTALL_ANDOR_VDIR = $(INSTALL_ANDOR_DIR)/v$(ANDOR_FULL_VERSION)
endif
ifneq ($(COMPILE_XH), 0)
INSTALL_XH_DIR = $(INSTALL_PLAT_DIR)/Xh
XH_FULL_VERSION = $(shell cat camera/xh/VERSION)
INSTALL_XH_VDIR = $(INSTALL_XH_DIR)/v$(XH_FULL_VERSION)
endif
ifneq ($(COMPILE_XPAD), 0)
INSTALL_XPAD_DIR = $(INSTALL_PLAT_DIR)/Xpad
XPAD_FULL_VERSION = $(shell cat camera/xpad/VERSION)
......@@ -372,6 +378,16 @@ ifneq ($(COMPILE_ANDOR), 0)
cp camera/andor/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_XH), 0)
mkdir -p $(INSTALL_XH_VDIR)
cp camera/xh/python/__init__.py $(INSTALL_XH_DIR)
$(call install_core_dep,$(INSTALL_XH_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimaxh.so*
cp -d build/liblimaxh.so* $(INSTALL_LIB_DIR)
cp sip/xh/limaxh.so $(INSTALL_XH_VDIR)
cp camera/xh/include/*.h $(INSTALL_INCLUDE_DIR)
endif
ifneq ($(COMPILE_XPAD), 0)
mkdir -p $(INSTALL_XPAD_VDIR)
cp camera/xpad/python/__init__.py $(INSTALL_XPAD_DIR)
......
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