summaryrefslogtreecommitdiff
path: root/external/firebird
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-07-07 23:14:31 +0300
committerTor Lillqvist <tml@collabora.com>2014-07-07 23:15:04 +0300
commit8159e3bd1a68c17e39cac10ecbb1ef880081c176 (patch)
tree0b12f833d17948290af4c351d2c10cfea9d235de /external/firebird
parent9c95aabbbe01026cf9995d2b08aea49b1184528e (diff)
Adapt for VS 2013
Change-Id: Icd7a3d0cbcb994986ea53a5fe91d3996b26cbe0c
Diffstat (limited to 'external/firebird')
-rw-r--r--external/firebird/UnpackedTarball_firebird.mk1
-rw-r--r--external/firebird/firebird-vs2013.patch.112
2 files changed, 13 insertions, 0 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index 8f0610203bd1..4e3aec42cea9 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 000000000000..4b930d111f8b
--- /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