diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-07-27 18:29:14 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-07-27 16:34:03 +0000 |
| commit | b9183b908ab199d5f88cea7b5451a3bd7fc12eef (patch) | |
| tree | 0586c513de304d862ed5f6a6e4b574c57459343f /config.nmake | |
| parent | 8762c78395433cd3aaaf91fc8431367c5009c416 (diff) | |
Use a compatible Lua library when building with MSVC2013
Change-Id: If462dc45df9dbd418c4de2eb6bb9130a283d863c
Reviewed-on: https://code.wireshark.org/review/3211
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index c7881b8ad5..3a4b860e36 100644 --- a/config.nmake +++ b/config.nmake @@ -242,7 +242,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1 WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -DOWNLOAD_TAG=2014-06-05 +DOWNLOAD_TAG=2014-07-26 ##### Win32 Libraries ##### # # Mandatory: GLib settings @@ -439,7 +439,9 @@ KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6 # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # -!IF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" +!IF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE" +LUA_DIST=-5.2.3_Win32_dll12 +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" LUA_DIST=-5.2.3_Win32_dll11 !ELSE LUA_DIST=-5.2.3_Win32_dll10 @@ -498,7 +500,7 @@ GEOIP_PKG=1.5.1-2 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws !else -DOWNLOAD_TAG=2014-06-05 +DOWNLOAD_TAG=2014-07-26 ##### Win64 Libraries ##### # # Mandatory: GLib settings @@ -686,7 +688,9 @@ GCC_DLL=libgcc_s_seh-1.dll # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # -!IF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" +!IF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE" +LUA_DIST=-5.2.3_Win64_dll12 +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" LUA_DIST=-5.2.3_Win64_dll11 !ELSE LUA_DIST=-5.2.3_Win64_dll10 |