From 180895c1e0e0d46cfd4b8be897fa4a81ee63d8a1 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Mon, 7 Aug 2017 15:26:22 -0400 Subject: [PATCH] attempt to fix win32 shared build --- src/ca/Makefile | 10 +++++++++- src/ca/caChannel.cpp | 2 +- src/ca/caStatus.cpp | 2 +- src/ca/{ => pv}/caStatus.h | 0 4 files changed, 11 insertions(+), 3 deletions(-) rename src/ca/{ => pv}/caStatus.h (100%) diff --git a/src/ca/Makefile b/src/ca/Makefile index 77de12d..640dd40 100644 --- a/src/ca/Makefile +++ b/src/ca/Makefile @@ -2,9 +2,17 @@ TOP = ../.. include $(TOP)/configure/CONFIG LIBRARY += pvAccessCA -pvAccessCA_LIBS += ca pvAccess pvData Com +pvAccessCA_LIBS += ca pvAccess pvData +ifdef WITH_MICROBENCH + LIB_LIBS += pvMB +endif +LIB_LIBS += Com + +# needed for Windows +LIB_SYS_LIBS_WIN32 += ws2_32 INC += pv/caProvider.h +INC += pv/caStatus.h pvAccessCA_SRCS += caProvider.cpp pvAccessCA_SRCS += caChannel.cpp diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp index cbc31e5..d65f142 100644 --- a/src/ca/caChannel.cpp +++ b/src/ca/caChannel.cpp @@ -12,7 +12,7 @@ #include #include "caChannel.h" -#include "caStatus.h" +#include using namespace epics::pvData; using std::string; diff --git a/src/ca/caStatus.cpp b/src/ca/caStatus.cpp index 7f97221..9eab588 100644 --- a/src/ca/caStatus.cpp +++ b/src/ca/caStatus.cpp @@ -4,7 +4,7 @@ * in file LICENSE that is included with this distribution. */ -#include "caStatus.h" +#include namespace epics { namespace pvAccess { diff --git a/src/ca/caStatus.h b/src/ca/pv/caStatus.h similarity index 100% rename from src/ca/caStatus.h rename to src/ca/pv/caStatus.h