From 5569724919aa221b53889b772077ca3a82a85fd8 Mon Sep 17 00:00:00 2001 From: Jakub Wlodek Date: Wed, 24 Apr 2024 13:44:52 -0400 Subject: [PATCH 1/2] Add missing link libraries linux --- iocs/pylonIOC/pylonApp/src/Makefile | 2 ++ pylonApp/src/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/iocs/pylonIOC/pylonApp/src/Makefile b/iocs/pylonIOC/pylonApp/src/Makefile index 3ddf8a9..7948644 100755 --- a/iocs/pylonIOC/pylonApp/src/Makefile +++ b/iocs/pylonIOC/pylonApp/src/Makefile @@ -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 # .dbd will be created from Include.dbd diff --git a/pylonApp/src/Makefile b/pylonApp/src/Makefile index 6b4aa1e..4cf7391 100644 --- a/pylonApp/src/Makefile +++ b/pylonApp/src/Makefile @@ -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 From 73bff0a7510c50aeb90b25b70ca0e34c1fc09345 Mon Sep 17 00:00:00 2001 From: Jakub Wlodek Date: Wed, 24 Apr 2024 13:45:33 -0400 Subject: [PATCH 2/2] Update gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2d91727 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +db/ +dbd/ +lib/ +bin/ +O.*/