diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-04-16 22:14:25 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-04-17 07:38:51 +0000 |
| commit | 791dd4e1285e10ab875ef741ec16fdbd406cf034 (patch) | |
| tree | 9ad8c6cf247a8106c5a7ac2e34dffefdd425f449 | |
| parent | 544f89eb9a1761373c961f62ee9cf76bcdc1f367 (diff) | |
| download | wireshark-791dd4e1285e10ab875ef741ec16fdbd406cf034.tar.gz wireshark-791dd4e1285e10ab875ef741ec16fdbd406cf034.tar.bz2 wireshark-791dd4e1285e10ab875ef741ec16fdbd406cf034.zip | |
Use Lua 5.2.3 linked against MSVCR110.DLL when compiling with MSVC2012
Change-Id: I372ca3b6ad80ee5a3073d06bccd3986a6d7ba27f
Reviewed-on: https://code.wireshark.org/review/1176
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | config.nmake | 8 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index c1c3d57046..cb4a2f1194 100644 --- a/config.nmake +++ b/config.nmake @@ -447,7 +447,11 @@ 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" +LUA_DIST=-5.2.3_Win32_dll11 +!ELSE LUA_DIST=-5.2.3_Win32_dll10 +!ENDIF LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 # @@ -694,7 +698,11 @@ GNUTLS_PKG=2.12.18-1.2-1 # If you don't have LUA, comment this line out, so that LUA_DIR # isn't defined. # +!IF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" +LUA_DIST=-5.2.3_Win64_dll11 +!ELSE LUA_DIST=-5.2.3_Win64_dll10 +!ENDIF LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.2.3 # diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 69b0f04b9d..76205c180f 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -22,7 +22,7 @@ # 32-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2014-04-06" +export DOWNLOAD_TAG="2014-04-16" export WIRESHARK_TARGET_PLATFORM="win32" WIN_SETUP=`echo $0 | sed -e s/win32/win/` diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh index c866d1c976..a56259159e 100755 --- a/tools/win64-setup.sh +++ b/tools/win64-setup.sh @@ -22,7 +22,7 @@ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2014-04-06" +export DOWNLOAD_TAG="2014-04-16" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |