From 791dd4e1285e10ab875ef741ec16fdbd406cf034 Mon Sep 17 00:00:00 2001
From: Pascal Quantin <pascal.quantin@gmail.com>
Date: Wed, 16 Apr 2014 22:14:25 +0200
Subject: 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>
---
 config.nmake | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'config.nmake')

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
 
 #
-- 
cgit v1.2.3