From cddbabf8bc2b33cf987c15288c5432213f343077 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 4 Mar 2019 18:17:12 -0800 Subject: [PATCH] auth fix mingw static --- examples/Makefile | 1 + testApp/Makefile | 1 + testApp/remote/Makefile | 1 - testApp/utils/Makefile | 3 --- testCa/Makefile | 1 + 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 213d459..3aef798 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -3,6 +3,7 @@ TOP=.. include $(TOP)/configure/CONFIG PROD_LIBS += pvAccessCA ca pvAccess pvData Com +PROD_SYS_LIBS_WIN32 += netapi32 ws2_32 TESTPROD_HOST += getme getme_SRCS = getme.cpp diff --git a/testApp/Makefile b/testApp/Makefile index 4d59b61..36f3675 100644 --- a/testApp/Makefile +++ b/testApp/Makefile @@ -11,6 +11,7 @@ USR_CPPFLAGS += -I$(TOP)/src/remoteClient PVACCESS_TEST = $(TOP)/testApp PROD_LIBS += pvAccess pvData Com +PROD_SYS_LIBS_WIN32 += netapi32 ws2_32 include $(PVACCESS_TEST)/utils/Makefile include $(PVACCESS_TEST)/remote/Makefile diff --git a/testApp/remote/Makefile b/testApp/remote/Makefile index 96eb216..0047a82 100644 --- a/testApp/remote/Makefile +++ b/testApp/remote/Makefile @@ -10,7 +10,6 @@ TESTS += testChannelAccess TESTPROD_HOST += testCodec testCodec_SRCS = testCodec testHarness_SRCS += testCodec.cpp -testCodec_SYS_LIBS_WIN32 += netapi32 ws2_32 TESTS += testCodec TESTPROD_HOST += testRPC diff --git a/testApp/utils/Makefile b/testApp/utils/Makefile index 79f6f47..ab5f17c 100644 --- a/testApp/utils/Makefile +++ b/testApp/utils/Makefile @@ -17,14 +17,11 @@ testInetAddressUtils = testInetAddressUtils.cpp # Avoid errors from inlined htonl() etc. used as template argument # TODO this is gcc only testInetAddressUtils_CXXFLAGS = -O0 -# needed for 64-bit Windows -testInetAddressUtils_SYS_LIBS_WIN32 += netapi32 ws2_32 testHarness_SRCS += testInetAddressUtils.cpp TESTS += testInetAddressUtils TESTPROD_HOST += configurationTest configurationTest_SRCS += configurationTest.cpp -configurationTest_SYS_LIBS_WIN32 += netapi32 ws2_32 #testHarness_SRCS += configurationTest.cpp TESTS += configurationTest diff --git a/testCa/Makefile b/testCa/Makefile index 47092ac..1b1ded0 100644 --- a/testCa/Makefile +++ b/testCa/Makefile @@ -7,6 +7,7 @@ include $(TOP)/configure/CONFIG USR_CPPFLAGS += -I$(TOP)/src/ca PROD_LIBS += pvAccess pvAccessCA pvData $(EPICS_BASE_IOC_LIBS) +PROD_SYS_LIBS_WIN32 += netapi32 ws2_32 TESTPROD_HOST += testCaProvider testCaProvider_SRCS += testCaProvider.cpp