diff options
Diffstat (limited to 'shell')
7 files changed, 13 insertions, 8 deletions
diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx index 1b8c1391f8cc..be97c30a6e81 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 e0213839cc9d..d0ea8e3e5b8a 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 71be05505127..2f7a08d5fdd0 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 7234b2eca495..41064332b8be 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 1f145f59a281..5778ccebd50d 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 c9b57d28f2aa..d943d3453ba8 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 7fd2fcdbb8ab..85e5e6b7bd29 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" |