diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-06-07 16:51:17 +0200 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-06-07 16:51:17 +0200 |
| commit | 27965df4e22fc400f35949c2ec3b88a2914a8d8a (patch) | |
| tree | 0c29792aeea81901efafca1c1fe5c51920d761cc /shell/source/win32 | |
| parent | f425cc4944368dbd9449cdcc164035ba8707e46c (diff) | |
| parent | aba7a3c63e51b4dcaef8efa440f101fc351e9740 (diff) | |
cws impress190: merging
Diffstat (limited to 'shell/source/win32')
| -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) |