[Libreoffice-commits] .: shell/source solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Aug 22 13:37:54 PDT 2011
shell/source/win32/ooofilereader/basereader.cxx | 2 ++
shell/source/win32/ooofilereader/contentreader.cxx | 2 ++
shell/source/win32/ooofilereader/metainforeader.cxx | 2 ++
shell/source/win32/shlxthandler/classfactory.cxx | 2 ++
shell/source/win32/shlxthandler/makefile.mk | 9 +--------
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx | 2 ++
shell/source/win32/shlxthandler/util/utilities.cxx | 2 ++
solenv/inc/set_wntx64.mk | 8 ++++++++
8 files changed, 21 insertions(+), 8 deletions(-)
New commits:
commit c3b5c166b9bc212d631558a7568a6eb24fea11c0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 22 23:05:55 2011 +0300
Make a dbgutil build of the Explorer extension succeed
Take notice of USE_DEBUG_RUNTIME also in set_wntx64.mk.
Don't unset USE_DEBUG_RUNTIME and don't hardcode the non-debugging
msvcprt.lib when building the Explorer extension.
Undefine OSL_DEBUG_LEVEL in its source files that would otherwise drag
in the diagnosing functions from sal. We don't link the Explorer
extension with sal.
As such it might not make much sense to actually *use* a shell
extension built with assertions in the C++ library, against the
debugging C/C++ runtime. You don't want assertions to fire in
Explorer, do you? On the other hand, one could be debugging an
Explorer extension remotely. Maybe even locally, I don't know if some
lower levels of Windows get upset if Explorer is unresponsive due to
being debugged, or something.
But anyway, the main point for now is to make an --enable-dbgutil
build succeed.
Alternatively we could also make sure USE_DEBUG_RUNTIME is unset in
*all* makefiles in shell.
diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx
index 1b8c139..be97c30 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#undef OSL_DEBUG_LEVEL
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx
index e021383..d0ea8e3 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#undef OSL_DEBUG_LEVEL
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx
index 71be055..2f7a08d 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#undef OSL_DEBUG_LEVEL
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index 7234b2e..4106433 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#undef OSL_DEBUG_LEVEL
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index 1f145f5..5778cce 100644
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -35,7 +35,6 @@ USE_DEFFILE=TRUE
USE_DEFFILE_X64=TRUE
.ENDIF
NO_DEFAULT_STL=TRUE
-USE_DEBUG_RUNTIME=
# --- Settings -----------------------------------------------------
@@ -92,11 +91,6 @@ SHL1STDLIBS+=\
$(GDI32LIB)\
$(GDIPLUSLIB)
-.IF "$(COM)"!="GCC"
-SHL1STDLIBS+=\
- msvcprt.lib
-.ENDIF
-
SHL1STDLIBS+=\
$(SHLWAPILIB)
@@ -148,8 +142,7 @@ SHL1STDLIBS_X64+=\
$(GDIPLUSLIB_X64) \
$(MSVCRT_X64) \
$(MSVCPRT_X64) \
- $(OLDNAMESLIB_X64) \
- msvcprt.lib
+ $(OLDNAMESLIB_X64)
SHL1LIBS_X64+=$(SLB_X64)$/util.lib\
$(SLB_X64)$/ooofilereader.lib
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index c9b57d2..d943d34 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#undef OSL_DEBUG_LEVEL
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index 7fd2fcd..85e5e6b 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#undef OSL_DEBUG_LEVEL
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index bc8fb74..c29e8ba 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -51,6 +51,9 @@ USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1
USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
USE_CDEFS_X64+=-DDEBUG
.ENDIF # "$(debug)"!=""
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+USE_CDEFS_X64+=-D_DEBUG
+.ENDIF
USE_CFLAGS_X64+=$(CFLAGS_X64)
USE_CDEFS_X64+=$(CDEFS_X64)
INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
@@ -144,8 +147,13 @@ URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib
WININETLIB_X64=$(LIBPATH_X64)/wininet.lib
OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib
MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib
+.IF "$(USE_DEBUG_RUNTIME)" != ""
+MSVCPRT_X64=$(LIBPATH_VC_X64)/msvcprtd.lib
+MSVCRT_X64=$(LIBPATH_VC_X64)/msvcrtd.lib
+.ELSE
MSVCPRT_X64=$(LIBPATH_VC_X64)/msvcprt.lib
MSVCRT_X64=$(LIBPATH_VC_X64)/msvcrt.lib
+.ENDIF
MISC_X64=$(MISC)/x64
OBJ_X64=$(OBJ)/x64
More information about the Libreoffice-commits
mailing list