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 | f5e50cd72846132ed5e542adb93feb49b2b68e2c (patch) | |
tree | a3a85c936b560b16ec01d1872dc8ce26fbe6f694 /shell | |
parent | eeaf2f34f56d815040b0e80b5e3abd6b08400bdc (diff) | |
parent | 9fa71b70aff7e91f16bad57993dc7f8614190e6d (diff) |
CWS-TOOLING: integrate CWS obo47
Diffstat (limited to 'shell')
-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 4452cb1a90..b6c9a45a95 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) |