diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-07-17 11:12:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-17 15:02:38 +0200 |
| commit | 78075142b0c7ff862899ef3c54eb3fce7c602e28 (patch) | |
| tree | 0dc354e74bd0d8954a79e6662903f0c1d5ac14f3 /firebird | |
| parent | fdfcf278c151aa3b29a895fe3e0bacce8a12c117 (diff) | |
firebird: fix build with MSVC debug runtimes
Change-Id: I6fc9ee8e37126fb35603a9e56295ced57ce8a2ee
Diffstat (limited to 'firebird')
| -rw-r--r-- | firebird/firebird-cygwin-msvc.patch.1 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/firebird/firebird-cygwin-msvc.patch.1 index 91a0edea17a5..8e800cf4d9c5 100644 --- a/firebird/firebird-cygwin-msvc.patch.1 +++ b/firebird/firebird-cygwin-msvc.patch.1 @@ -25,12 +25,16 @@ diff -u firebird/builds/posix/make.defaults firebird/builds/posix/make.defaults RANLIB= @RANLIB@ BTYACC=$(ROOT)/extern/btyacc/btyacc -@@ -152,16 +160,28 @@ +@@ -152,16 +160,32 @@ STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS) $(CXXFLAGS) LINK_LIBS = @LIBS@ +ifeq ($(PLATFORM),win32) ++ifeq ($(MSVC_USE_DEBUG_RUNTIME),TRUE) ++ICU_LIBS = -licuucd -licudtd -licuind ++else +ICU_LIBS = -licuuc -licudt -licuin ++endif +else ICU_LIBS = -licuuc -licudata -licui18n +endif |