Skip to content
Open
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
db/
dbd/
lib/
bin/
O.*/
2 changes: 2 additions & 0 deletions iocs/pylonIOC/pylonApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ PROD_NAME = pylonApp
PROD_IOC_WIN32 += $(PROD_NAME)
ifeq ($(WITH_PYLON), YES)
PROD_IOC_Linux += $(PROD_NAME)
USR_LDFLAGS_Linux += -L $(PYLON_LIB) -Wl,-rpath,$(PYLON_LIB)
PROD_SYS_LIBS_Linux += GenApi_gcc_v3_1_Basler_pylon GCBase_gcc_v3_1_Basler_pylon pylonbase pylonutility
endif

# <name>.dbd will be created from <name>Include.dbd
Expand Down
4 changes: 2 additions & 2 deletions pylonApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ include $(TOP)/configure/CONFIG

LIBRARY_IOC_WIN32 += ADPylon

# External Python Linux SDK
# External Pylon Linux SDK
ifeq ($(WITH_PYLON), YES)
LIBRARY_IOC_Linux += ADPylon

USR_CPPFLAGS_Linux += -I $(PYLON_INCLUDE)
USR_LDFLAGS_Linux += -L $(PYLON_LIB) -Wl,-rpath,$(PYLON_LIB)
LIB_SYS_LIBS_Linux += pylonbase pylonutility
LIB_SYS_LIBS_Linux += pylonbase pylonutility GenApi_gcc_v3_1_Basler_pylon GCBase_gcc_v3_1_Basler_pylon
endif

# Pylon Windows SDK
Expand Down