EPICS_base/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