osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Pascal Quantin 2014-04-16 22:14:25 +02:00 committed by Anders Broman
parent 544f89eb9a
commit 791dd4e128
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config.nmake
View File

@ -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
#

2
tools/win32-setup.sh
View File

@ -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/`

2
tools/win64-setup.sh
View File

@ -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/`