diff options
author | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
---|---|---|
committer | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
commit | 1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322 (patch) | |
tree | d6dde0ea7b6e6e15cc2c51a5f478fb85965b9720 /Makefile.nmake | |
parent | 0b8d70bfb715bc3d89b6dfae86fc79d7c4387f02 (diff) |
Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.
svn path=/trunk/; revision=47992
Diffstat (limited to 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 507a925668..d7a978a638 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -41,7 +41,6 @@ LDFLAGS = /NOLOGO /INCREMENTAL:NO $(LOCAL_LDFLAGS) # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ - -D_NEED_VAR_IMPORT_ \ /I. /Iwiretap $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(GNUTLS_CFLAGS) \ @@ -428,7 +427,6 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_PCAP_SET_DATALINK@/$(PCAP_SET_DATALINK_CONFIG)/" \ -e "s/@HAVE_PCAP_SETSAMPLING@/$(PCAP_SETSAMPLING_CONFIG)/" \ -e "s/@HAVE_BPF_IMAGE@/$(BPF_IMAGE_CONFIG)/" \ - -e "s/@HAVE_LIBWIRESHARKDLL@/$(LIBWIRESHARK_CONFIG)/" \ -e "s/@HAVE_LIBGNUTLS@/$(GNUTLS_CONFIG)/" \ -e "s/@HAVE_LIBGCRYPT@/$(LIBGCRYPT_CONFIG)/" \ -e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \ @@ -488,8 +486,6 @@ QMAKE_CFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/) QMAKE_LFLAGS *= /LARGEADDRESSAWARE $(LDFLAGS) -DEFINES += _NEED_VAR_IMPORT_ - <<KEEP ps.c: tools\rdps.py print.ps |