[Libreoffice-commits] core.git: external/firebird

[Tor Lillqvist]

 external/firebird/UnpackedTarball_firebird.mk |    1 +
 external/firebird/firebird-vs2013.patch.1     |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 8159e3bd1a68c17e39cac10ecbb1ef880081c176
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jul 7 23:14:31 2014 +0300

    Adapt for VS 2013
    
    Change-Id: Icd7a3d0cbcb994986ea53a5fe91d3996b26cbe0c

diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 8f06102..4e3aec4 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
 	external/firebird/firebird-cygwin-msvc.patch.1 \
+	external/firebird/firebird-vs2013.patch.1 \
 ))
 endif
 
diff --git a/external/firebird/firebird-vs2013.patch.1 b/external/firebird/firebird-vs2013.patch.1
new file mode 100644
index 0000000..4b930d1
--- /dev/null
+++ b/external/firebird/firebird-vs2013.patch.1
@@ -0,0 +1,12 @@
+# -*- Mode: Diff -*-
+--- firebird/src/jrd/os/win32/mod_loader.cpp
++++ firebird/src/jrd/os/win32/mod_loader.cpp
+@@ -97,6 +97,8 @@
+ 					"mscvr100.dll",
+ #elif _MSC_VER == 1700
+ 					"mscvr110.dll",
++#elif _MSC_VER == 1800
++					"mscvr120.dll",
+ #else
+                     #error Specify CRT DLL name here !
+ #endif