diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-02-23 15:52:34 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-02-23 15:52:34 +0100 |
commit | 9153fdd3f7db953e6aa132c3501a197cc3f1ca16 (patch) | |
tree | abe095c785949d4ec59ad1a76fcc5d96d7d8d188 /shell | |
parent | b183fb23eb5bcafbd0ffd05c023e03ccba90675f (diff) |
#i10000# fix for buildbreaker
Diffstat (limited to 'shell')
-rwxr-xr-x | shell/source/win32/shlxthandler/makefile.mk | 2 | ||||
-rwxr-xr-x | shell/source/win32/shlxthandler/ooofilt/makefile.mk | 9 | ||||
-rwxr-xr-x | shell/source/win32/shlxthandler/prophdl/makefile.mk | 14 |
3 files changed, 19 insertions, 6 deletions
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index 69d247cf51..d543d91d9e 100755 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -76,7 +76,7 @@ SHL1STDLIBS+=\ $(KERNEL32LIB)\ $(GDI32LIB)\ $(GDIPLUSLIB)\ - msvcprt.lib + msvcprt.lib \ $(SHLWAPILIB) SHL1LIBS+=$(SLB)$/util.lib\ diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk index afd51c1dd4..0d2a40e147 100755 --- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk +++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk @@ -74,7 +74,12 @@ SHL1STDLIBS+=$(OLE32LIB)\ $(SHELL32LIB)\ $(KERNEL32LIB)\ $(OLDNAMESLIB)\ - msvcprt.lib + msvcprt.lib + +.IF "$(PRODUCT)"!="full" +SHL1STDLIBS+=msvcrt.lib +.ENDIF + # $(LIBSTLPORTST) @@ -130,4 +135,4 @@ DEF1EXPORTFILE_X64=exports.dxp .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) .EXPORT : INCLUDE -.INCLUDE : tg_wntx64.mk
\ No newline at end of file +.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk index b9153bf014..572dcb9385 100755 --- a/shell/source/win32/shlxthandler/prophdl/makefile.mk +++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk @@ -30,6 +30,7 @@ PRJNAME=shell TARGET=propertyhdl LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE +NO_DEFAULT_STL=YES USE_DEFFILE=TRUE .IF "$(BUILD_X64)"!="" USE_DEFFILE_X64=TRUE @@ -43,7 +44,7 @@ UWINAPILIB = UWINAPILIB_X64 = 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 +CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100 CDEFS+=-D_WIN32_IE=0x501 # --- Files -------------------------------------------------------- @@ -72,7 +73,12 @@ SHL1STDLIBS+=\ $(GDI32LIB)\ $(GDIPLUSLIB)\ $(SHLWAPILIB)\ - $(PROPSYSLIB) + $(PROPSYSLIB) \ + msvcprt.lib + +.IF "$(PRODUCT)"!="full" +SHL1STDLIBS+=msvcrt.lib +.ENDIF SHL1LIBS+=$(SLB)$/util.lib\ $(SLB)$/ooofilereader.lib @@ -127,4 +133,6 @@ DEF1EXPORTFILE_X64=exports.dxp # --- Targets ------------------------------------------------------ .INCLUDE : set_wntx64.mk .INCLUDE : target.mk -.INCLUDE : tg_wntx64.mk
\ No newline at end of file +INCLUDE!:=$(subst,/stl, $(INCLUDE)) +.EXPORT : INCLUDE +.INCLUDE : tg_wntx64.mk |