ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Fix firebird MSVC 15.0 detection

Browse Source 
Change-Id: I9721632c68e6428b03b0368e7802c6eb4f5eb0a2
Reviewed-on: https://gerrit.libreoffice.org/34323
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
David Ostrovsky
2017-02-15 22:44:57 +00:00
parent 50089a812b
commit 3e1e49561b
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/firebird/UnpackedTarball_firebird.mk
Vendored
+1
View File
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
ifeq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-cygwin-msvc.patch \
external/firebird/firebird-vs2017.patch.1 \
))
endif
external/firebird/firebird-vs2017.patch.1
Vendored
+12
View File
@@ -0,0 +1,12 @@
diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp firebird/src/common/os/win32/mod_loader.cpp
--- firebird.orig/src/common/os/win32/mod_loader.cpp 2017-02-15 22:11:48.939042400 +0100
+++ firebird/src/common/os/win32/mod_loader.cpp 2017-02-15 22:12:30.062262700 +0100
@@ -103,6 +103,8 @@
"msvcr120.dll",
#elif _MSC_VER == 1900
"vcruntime140.dll",
+#elif _MSC_VER == 1910
+ "vcruntime140.dll",
#else
#error Specify CRT DLL name here !
#endif