diff options
| -rw-r--r-- | config.nmake | 14 | ||||
| -rw-r--r-- | tools/win-setup.ps1 | 6 |
2 files changed, 7 insertions, 13 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. diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index c69af7d425..97108b9b98 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -101,8 +101,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2015-05-30" -$Win32CurrentTag = "2015-05-30" +$Win64CurrentTag = "2015-08-29" +$Win32CurrentTag = "2015-08-29" # Archive file / subdir. $Win64Archives = @{ @@ -141,7 +141,7 @@ $Win32Archives = @{ # Lua -if ( @("12", "11", "10") -contains $VSVersion ) { +if ( @("14", "12", "11", "10") -contains $VSVersion ) { $Win64Archives["lua-5.2.3_Win64_dll$($VSVersion)_lib.zip"] = "lua5.2.3" $Win32Archives["lua-5.2.3_Win32_dll$($VSVersion)_lib.zip"] = "lua5.2.3" } |