Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions configure/CONFIG_SITE
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ CHECK_RELEASE = YES
# take effect.
#IOCS_APPL_TOP = </IOC/path/to/application/top>

# Define where the PVCam SDK is located

# Linux default
PVCAM_SDK=/opt/pvcam/sdk
PVCAM_INCLUDE = $(PVCAM_SDK)/include
PVCAM_LIB = $(PVCAM_SDK)/library/x86_64

# Windows default
#PVCAM_SDK="C:/Program Files/Photometrics/PVCamSDK"
#PVCAM_INCLUDE = $(PVCAM_SDK)/include
#PVCAM_LIB = $(PVCAM_SDK)/lib/amd64

# Get settings from AREA_DETECTOR, so we only have to configure once for all detectors if we want to
-include $(AREA_DETECTOR)/configure/CONFIG_SITE
-include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH)
Expand Down
16 changes: 6 additions & 10 deletions kinetixSupport/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,16 @@ include $(TOP)/configure/CONFIG
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================

# The files in this directory are installed first because they are
# used by PVCam driver
# Pull in the necessary libraries and headers from your PVCam SDK installation.

INC += pvcam.h master.h
SRC_DIRS += $(PVCAM_INCLUDE)

LIB_INSTALLS_Linux += ../os/linux-x86_64/libpvcam.so
LIB_INSTALLS_Linux += ../os/linux-x86_64/libpvcam.so.2
LIB_INSTALLS_Linux += ../os/linux-x86_64/libpvcam.so.2.6
INC += pvcam.h master.h

LIB_INSTALLS_Linux += ../os/linux-x86_64/libpvcamDDI.so
LIB_INSTALLS_Linux += ../os/linux-x86_64/libpvcamDDI.so.3
LIB_INSTALLS_Linux += ../os/linux-x86_64/libpvcamDDI.so.3.1
LIB_INSTALLS_Linux += $(PVCAM_LIB)/libpvcam.so
LIB_INSTALLS_Linux += $(PVCAM_LIB)/libpvcamDDI.so

LIB_INSTALLS_WIN32 += ../os/windows-x64/pvcam64.lib
LIB_INSTALLS_WIN32 += $(PVCAM_LIB)/pvcam64.lib


#=============================
Expand Down
120 changes: 0 additions & 120 deletions kinetixSupport/master.h

This file was deleted.

Binary file removed kinetixSupport/os/linux-x86/libpvcam.so
Binary file not shown.
Binary file removed kinetixSupport/os/linux-x86/libpvcam.so.2
Binary file not shown.
Binary file removed kinetixSupport/os/linux-x86/libpvcam.so.2.6
Binary file not shown.
Binary file removed kinetixSupport/os/linux-x86/libpvcamDDI.so
Binary file not shown.
Binary file removed kinetixSupport/os/linux-x86/libpvcamDDI.so.3
Binary file not shown.
Binary file removed kinetixSupport/os/linux-x86/libpvcamDDI.so.3.0
Binary file not shown.
1 change: 0 additions & 1 deletion kinetixSupport/os/linux-x86_64/libpvcam.so

This file was deleted.

1 change: 0 additions & 1 deletion kinetixSupport/os/linux-x86_64/libpvcam.so.2

This file was deleted.

Binary file removed kinetixSupport/os/linux-x86_64/libpvcam.so.2.6
Binary file not shown.
1 change: 0 additions & 1 deletion kinetixSupport/os/linux-x86_64/libpvcamDDI.so

This file was deleted.

1 change: 0 additions & 1 deletion kinetixSupport/os/linux-x86_64/libpvcamDDI.so.3

This file was deleted.

Binary file removed kinetixSupport/os/linux-x86_64/libpvcamDDI.so.3.1
Binary file not shown.
120 changes: 0 additions & 120 deletions kinetixSupport/os/linux-x86_64/master.h

This file was deleted.

Binary file removed kinetixSupport/os/windows-x64/pvcam64.lib
Binary file not shown.
Loading