Commit e99dc4cc authored by Laurent Claustre's avatar Laurent Claustre

updated for new plugin RayonixHs

parent 828d0385
......@@ -589,7 +589,8 @@ endif
############################
ifneq ($(COMPILE_RAYONIXHS),0)
RAYONIXHS_LDFLAGS := $(LDFLAGS) -L../camera/rayonixhs/sdk/lib64
#RAYONIXHS_LDFLAGS := $(LDFLAGS) -L../camera/rayonixhs/sdk/lib64
RAYONIXHS_LDFLAGS := $(LDFLAGS) -L/opt/rayonix/lib64
RAYONIXHS_LDLIBS := $(LDLIBS) -lcraydl
rayonixhs-name := rayonixhs
......
Subproject commit b10b71153daf9b2dc46a11d95e08d5e9038e8957
Subproject commit 6986a4c5b5af7fda24bce4bad25d74a0c85e98d5
......@@ -483,11 +483,11 @@ ifneq ($(COMPILE_RAYONIXHS), 0)
$(call install_core_dep,$(INSTALL_RAYONIXHS_VDIR))
rm -rf $(INSTALL_LIB_DIR)/liblimarayonixhs.so*
cp -d build/liblimarayonixhs.so* $(INSTALL_LIB_DIR)
cp -d camera/rayonixhs/sdk/lib64/libcraydl.so* $(INSTALL_LIB_DIR)
cp -d camera/rayonixhs/sdk/lib64/libcraydl_gpu.so* $(INSTALL_LIB_DIR)
cp -d camera/rayonixhs/sdk/lib64/libcbf.so* $(INSTALL_LIB_DIR)
cp -d camera/rayonixhs/sdk/lib64/libSiVCamDll.so* $(INSTALL_LIB_DIR)
cp -dr camera/rayonixhs/sdk/lib64/libcraydl_nocuda $(INSTALL_LIB_DIR)
#cp -d camera/rayonixhs/sdk/lib64/libcraydl.so* $(INSTALL_LIB_DIR)
#cp -d camera/rayonixhs/sdk/lib64/libcraydl_gpu.so* $(INSTALL_LIB_DIR)
#cp -d camera/rayonixhs/sdk/lib64/libcbf.so* $(INSTALL_LIB_DIR)
#cp -d camera/rayonixhs/sdk/lib64/libSiVCamDll.so* $(INSTALL_LIB_DIR)
#cp -dr camera/rayonixhs/sdk/lib64/libcraydl_nocuda $(INSTALL_LIB_DIR)
cp sip/rayonixhs/limarayonixhs.so $(INSTALL_RAYONIXHS_VDIR)
cp camera/rayonixhs/include/*.h $(INSTALL_INCLUDE_DIR)
endif
......@@ -184,7 +184,7 @@ def main():
elif(modName == 'pointgrey'):
extraIncludes += ['/usr/include/flycapture']
elif(modName == 'rayonixhs'):
extraIncludes += ['../../camera/rayonixhs/sdk/include/craydl']
extraIncludes += ['/opt/rayonix/include/craydl','/opt/rayonix/include']
extraIncludes += findModuleIncludes(modName)
sipFile = open(sipFileName,"a")
......
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