diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 16:20:18 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-09 19:57:20 +0100 |
| commit | 553aed7b518599742189ffce50cd947dbf39a2e7 (patch) | |
| tree | cd8d0ae2e88760bb99b9318a71903d8ff535d862 /shell | |
| parent | c824a1f69c093f38b82ead0f413c75b492a1f994 (diff) | |
Trying to remove the stlport mention from the code
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/makefile.mk | 2 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/ooofilt/makefile.mk | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index b6c9a45a9515..fdaa1c43d92c 100644 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -35,7 +35,7 @@ USE_DEFFILE=TRUE USE_DEFFILE_X64=TRUE .ENDIF NO_DEFAULT_STL=TRUE -USE_STLP_DEBUG= +USE_DEBUG_RUNTIME= # --- Settings ----------------------------------------------------- diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk index 9111069ab889..fd1bc503cc33 100644 --- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk +++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk @@ -32,9 +32,6 @@ LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE USE_DEFFILE=TRUE -# Do not use the dynamic STLport library. -NO_DEFAULT_STL=YES - # Do not use the uwinapi library UWINAPILIB= @@ -46,7 +43,6 @@ UWINAPILIB= CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS+=-D_WIN32_IE=0x501 -# SCPCDEFS+=-D_STLP_USE_STATIC_LIB # --- Files -------------------------------------------------------- @@ -54,9 +50,6 @@ SLOFILES=$(SLO)$/ooofilt.obj\ $(SLO)$/propspec.obj\ $(SLO)$/stream_helper.obj -# $(SLO)$/utilities.obj -# $(SLO)$/dbgmacros.obj - SHL1TARGET=$(TARGET) .IF "$(COM)"=="GCC" SHL1STDLIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB) @@ -84,8 +77,6 @@ SHL1STDLIBS+=msvcrt.lib .ENDIF -# $(LIBSTLPORTST) - SHL1LIBS+=$(SLB)$/util.lib\ $(SLB)$/ooofilereader.lib |