folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

makefile: Add support for XCode 12 on macOS 11

Browse source 
Solves problems reported in #934 and #964
This commit is contained in:
Mark Pizzolato 2020-11-24 16:39:55 -08:00
parent bf2dabdebf
commit 0fb0ab516d
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
makefile
View file

@ -543,6 +543,11 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
OS_CCDEFS += -DHAVE_DLOPEN=${LIBEXT} OS_CCDEFS += -DHAVE_DLOPEN=${LIBEXT}
OS_LDFLAGS += -ldld OS_LDFLAGS += -ldld
$(info using libdld: $(call find_lib,dld) $(call find_include,dlfcn)) $(info using libdld: $(call find_lib,dld) $(call find_include,dlfcn))
else
ifeq (Darwin,$(OSTYPE))
OS_CCDEFS += -DHAVE_DLOPEN=dylib
$(info using macOS dlopen with .dylib)
endif
endif endif
endif endif
endif endif
@ -704,6 +709,11 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
$(info using libpcap: $(call find_lib,$(PCAPLIB)) $(call find_include,pcap)) $(info using libpcap: $(call find_lib,$(PCAPLIB)) $(call find_include,pcap))
endif endif
LIBEXT = $(LIBEXTSAVE) LIBEXT = $(LIBEXTSAVE)
ifeq (Darwin,$(OSTYPE)$(findstring USE_,$(NETWORK_CCDEFS)))
NETWORK_CCDEFS += -DUSE_SHARED
NETWORK_FEATURES = - dynamic networking support using $(OSNAME) provided libpcap components
$(info using macOS dynamic libpcap: $(call find_include,pcap))
endif
endif endif
else else
# On non-Linux platforms, we'll still try to provide deprecated support for libpcap in /usr/local # On non-Linux platforms, we'll still try to provide deprecated support for libpcap in /usr/local