diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-08-29 22:28:01 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-08-30 15:33:23 +0000 |
| commit | 00087b475180607a0f3956238e3f4241db30164a (patch) | |
| tree | f2ed36505ea8e73e2808ace13a0202bdf14f17c2 /config.nmake | |
| parent | 99e16ce82028f2fee6cdf31c7abb9918131e6c22 (diff) | |
| download | wireshark-00087b475180607a0f3956238e3f4241db30164a.tar.gz | |
Add Lua 5.2.3 built with MSVC2015
Change-Id: I9b173f5136f858e4f95fb5b0688ef02c08a8d9e4
Reviewed-on: https://code.wireshark.org/review/10313
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/config.nmake b/config.nmake index 787e64e3c9..51ba0f2770 100644 --- a/config.nmake +++ b/config.nmake @@ -253,7 +253,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1 WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -DOWNLOAD_TAG=2015-05-30 +DOWNLOAD_TAG=2015-08-29 ##### Win32 Libraries ##### # # Mandatory: GLib settings @@ -454,7 +454,7 @@ K5SPRT_DLL=k5sprt32.dll # isn't defined. # !IF "$(MSVC_VARIANT)" == "MSVC2015" || "$(MSVC_VARIANT)" == "MSVC2015CE" -#LUA_DIST=-5.2.3_Win32_dll14 No LUA binary available yet- +LUA_DIST=-5.2.3_Win32_dll14 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE" LUA_DIST=-5.2.3_Win32_dll12 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" @@ -462,10 +462,7 @@ LUA_DIST=-5.2.3_Win32_dll11 !ELSE LUA_DIST=-5.2.3_Win32_dll10 !ENDIF -# There is no binary for LUA built with MSVC2015 currently (2015-08-13) -!IF "$(MSVC_VARIANT)" != "MSVC2015" && "$(MSVC_VARIANT)" != "MSVC2015CE" LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 -!ENDIF # # Optional: the PORTAUDIO library enables audio output for RTP streams. @@ -521,7 +518,7 @@ GEOIP_PKG=1.5.1-2 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws !else -DOWNLOAD_TAG=2015-05-30 +DOWNLOAD_TAG=2015-08-29 ##### Win64 Libraries ##### # # Mandatory: GLib settings @@ -714,7 +711,7 @@ K5SPRT_DLL=k5sprt64.dll # isn't defined. # !IF "$(MSVC_VARIANT)" == "MSVC2015" || "$(MSVC_VARIANT)" == "MSVC2015CE" -#LUA_DIST=-5.2.3_Win64_dll14 no LUA library for MSVC2015 yet +LUA_DIST=-5.2.3_Win64_dll14 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE" LUA_DIST=-5.2.3_Win64_dll12 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" @@ -722,10 +719,7 @@ LUA_DIST=-5.2.3_Win64_dll11 !ELSE LUA_DIST=-5.2.3_Win64_dll10 !ENDIF -# There is no binary for LUA built with MSVC2015 currently (2015-08-13) -!IF "$(MSVC_VARIANT)" != "MSVC2015" && "$(MSVC_VARIANT)" != "MSVC2015CE" LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 -!ENDIF # # Optional: the PORTAUDIO library enables audio output for RTP streams. |