[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - RepositoryFixes.mk solenv/gbuild solenv/inc

[Herbert Dürr]

 RepositoryFixes.mk      |    6 +++---
 solenv/gbuild/gbuild.mk |    1 -
 solenv/inc/wntmsci11.mk |    1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 2a8050f9e28c97d08f6b8684c0a091a9160c2874
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Jun 6 16:52:50 2013 +0000

    #i122378# fix build of dbgutil-enabled static libraries on Windows

diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 2338c9a..93c8222 100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -292,7 +292,6 @@ LIBCMT=msvcrt.lib
 .ELSE # "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_STLP_DEBUG)" != ""
 LIBCMT=libcmt.lib
-CDEFS+=-D_DEBUG
 .ELSE  # "$(USE_STLP_DEBUG)" != ""
 LIBCMT=libcmt.lib
 .ENDIF # "$(USE_STLP_DEBUG)" != ""
commit d54c8fadb01519d1bbfcfa4669cb128745c5c2c0
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Jun 6 16:41:46 2013 +0000

    #i122378# fix dbgutil-enabled gbuild of modules on Windows
    
    gbuild modules should use the same crt-libs and crt-options as dmake modules

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 22d5406..4d8ec80 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -165,9 +165,9 @@ gb_Library_NOILIBFILENAMES:=\
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
-ifneq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
-endif
+#ifneq ($(gb_PRODUCT),$(true))
+#gb_Library_FILENAMES := $(patsubst msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
+#endif
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 6205687..848ced3 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -177,7 +177,6 @@ else
 gb_GLOBALDEFS += \
 	-DDBG_UTIL \
 	-D_STLP_DEBUG \
-	-D_DEBUG \
 
 endif