epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Revert "try to fix downstream win32 linking"

Browse Source 
This reverts commit 4f0c4c46a3.
This commit is contained in:
Michael Davidsaver
2019-05-16 18:09:47 -07:00
parent 4f0c4c46a3
commit f9ac164ee7
6 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure/CONFIG_PVACCESS_MODULE
View File

@ -3,16 +3,5 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
# Libraries needed to link a pvAccess tool
# LIbraries needed to link a pvAccess tool
EPICS_BASE_PVA_CORE_LIBS = pvAccessIOC pvAccessCA pvAccess pvData
ifneq ($(SKIP_PVA_AUTO_LIBS),YES)
# automatically inject -lnetapi32 and -lws2_32 along with -lpvAccess
define _PVA_ADD_NETAPI
$(1)_SYS_LIBS_WIN32 += $$(if $$(findstring pvAccess,$$($(1)_LIBS)),netapi32 ws2_32)
endef
$(foreach loc,PROD TESTPROD $(PROD) $(TESTPROD) LIB $(LIBRARY),$(eval $(call _PVA_ADD_NETAPI,$(loc))))
endif

1
examples/Makefile
View File

@ -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

2
pvtoolsSrc/Makefile
View File

@ -30,6 +30,8 @@ pvlist_SRCS += pvlist.cpp
PROD_LIBS += pvAccessCA pvAccess pvData ca Com
PROD_SYS_LIBS_WIN32 += netapi32 ws2_32
include $(TOP)/configure/RULES
#----------------------------------------
# ADD RULES AFTER THIS LINE

3
src/ca/Makefile
View File

@ -6,6 +6,9 @@ pvAccessCA_LIBS += pvAccess pvData ca Com
SHRLIB_VERSION ?= $(EPICS_PVA_MAJOR_VERSION).$(EPICS_PVA_MINOR_VERSION).$(EPICS_PVA_MAINTENANCE_VERSION)
# needed for Windows
LIB_SYS_LIBS_WIN32 += netapi32 ws2_32
INC += pv/caProvider.h
pvAccessCA_SRCS += channelConnectThread.cpp

1
testApp/Makefile
View File

@ -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

1
testCa/Makefile
View File

@ -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