diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-03 15:26:19 +0200 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-03 15:26:19 +0200 |
commit | b337a35ab64a8e5bae38e82bc5262c900b8b9645 (patch) | |
tree | cce9022130f98570f82c18fd2ec8ed3799ce93cc | |
parent | 515792c312abc929b4616c757b8eaced67718d10 (diff) | |
parent | 77c518fe99bc7c511174a32a3b97ee40e5a5f556 (diff) |
CWS-TOOLING: integrate CWS obo47
-rw-r--r-- | shell/source/win32/shlxthandler/makefile.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index 4452cb1a90e6..b6c9a45a9515 100644 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -34,6 +34,9 @@ USE_DEFFILE=TRUE .IF "$(BUILD_X64)"!="" USE_DEFFILE_X64=TRUE .ENDIF +NO_DEFAULT_STL=TRUE +USE_STLP_DEBUG= + # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk @@ -134,10 +137,6 @@ SHL1STDLIBS_X64+=\ $(OLDNAMESLIB_X64) \ msvcprt.lib -.IF "$(PRODUCT)"!="full" -SHL1STDLIBS+=msvcrt.lib -.ENDIF - SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ $(SLB_X64)$/ooofilereader.lib SHL1OBJS_X64=$(SLOFILES_X64) |