From 2ea014ae467154a85cbbc1dd26e3e5312579323f Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Thu, 26 Mar 2020 20:32:53 +0000 Subject: [PATCH 1/2] Remove HOST_OPT=NO On Windows changing HOST_OPT changes the compiler flags potentially resulting in the mixing of debug and release libraries in the final IOC --- configure/CONFIG_APP | 1 - 1 file changed, 1 deletion(-) diff --git a/configure/CONFIG_APP b/configure/CONFIG_APP index 8ebedde..2d93366 100644 --- a/configure/CONFIG_APP +++ b/configure/CONFIG_APP @@ -24,4 +24,3 @@ endif # dbst based database optimization (default: NO) DB_OPT = NO -HOST_OPT=NO From 1c9278812b55e389e8b127e6f9b97b296ccc6c87 Mon Sep 17 00:00:00 2001 From: Henrique Silva Date: Wed, 1 Apr 2020 14:04:58 +0200 Subject: [PATCH 2/2] Link streamApp against seq and pv libs when SNCSEQ is defined This avoids linking problems if the calc lib has been compiled with seq support. --- streamApp/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/streamApp/Makefile b/streamApp/Makefile index ae5dd7e..0b4198e 100644 --- a/streamApp/Makefile +++ b/streamApp/Makefile @@ -68,6 +68,10 @@ PROD_LIBS += sscan endif endif +ifneq ($(words $(SNCSEQ) $(SYNAPPS)), 0) +PROD_LIBS += seq pv +endif + streamApp_DBD += stream.dbd ifdef PCRE