Author: hdu
Date: Thu Jun 6 16:41:46 2013
New Revision: 1490351
URL: http://svn.apache.org/r1490351
Log:
#i122378# fix dbgutil-enabled gbuild of modules on Windows
gbuild modules should use the same crt-libs and crt-options as dmake modules
Modified:
openoffice/trunk/main/RepositoryFixes.mk
openoffice/trunk/main/solenv/gbuild/gbuild.mk
Modified: openoffice/trunk/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1490351&r1=1490350&r2=1490351&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Thu Jun 6 16:41:46 2013
@@ -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))
Modified: openoffice/trunk/main/solenv/gbuild/gbuild.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/gbuild.mk?rev=1490351&r1=1490350&r2=1490351&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/gbuild.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/gbuild.mk Thu Jun 6 16:41:46 2013
@@ -177,7 +177,6 @@ else
gb_GLOBALDEFS += \
-DDBG_UTIL \
-D_STLP_DEBUG \
- -D_DEBUG \
endif
