diff options
Diffstat (limited to 'shell/source/win32/shlxthandler')
7 files changed, 6 insertions, 30 deletions
diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk index 7157f8f6ae2b..31c019f31f76 100644 --- a/shell/source/win32/shlxthandler/columninfo/makefile.mk +++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk @@ -42,10 +42,6 @@ CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/columninfo.obj diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk index 38126a54c697..e7caf3afd244 100644 --- a/shell/source/win32/shlxthandler/infotips/makefile.mk +++ b/shell/source/win32/shlxthandler/infotips/makefile.mk @@ -42,10 +42,6 @@ CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/$(TARGET).obj diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index 81c3515b20b7..b15f0ee0409b 100644 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -59,10 +59,6 @@ CDEFS+=-DDONT_HAVE_GDIPLUS CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/classfactory.obj\ @@ -82,7 +78,7 @@ SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) $(COMCTL32LIB) SHL1LIBS= .ELSE SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ +SHL1LIBS=$(SOLARLIBDIR)$/$(ZLIB3RDLIB)\ $(SOLARLIBDIR)$/expat_xmlparse.lib\ $(SOLARLIBDIR)$/expat_xmltok.lib .ENDIF @@ -132,7 +128,7 @@ SLOFILES_X64= \ $(SLO_X64)$/stream_helper.obj\ SHL1TARGET_X64=$(TARGET) -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ +SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/$(ZLIB3RDLIB)\ $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ $(SOLARLIBDIR_X64)$/expat_xmltok.lib diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk index afb2988bb12c..2ccf2ca891b7 100644 --- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk +++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk @@ -46,10 +46,6 @@ CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/ooofilt.obj\ @@ -62,7 +58,7 @@ SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) SHL1LIBS= .ELSE SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ +SHL1LIBS=$(SOLARLIBDIR)$/$(ZLIB3RDLIB)\ $(SOLARLIBDIR)$/expat_xmlparse.lib\ $(SOLARLIBDIR)$/expat_xmltok.lib .ENDIF @@ -108,7 +104,7 @@ SLOFILES_X64=$(SLO_X64)$/ooofilt.obj\ SHL1TARGET_X64=$(TARGET) -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ +SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/$(ZLIB3RDLIB)\ $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ $(SOLARLIBDIR_X64)$/expat_xmltok.lib diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk index 8a6813a616fb..56355e13e8b4 100644 --- a/shell/source/win32/shlxthandler/prophdl/makefile.mk +++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk @@ -67,7 +67,7 @@ SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) $(COMCTL32LIB) SHL1LIBS= .ELSE SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ +SHL1LIBS=$(SOLARLIBDIR)$/$(ZLIB3RDLIB)\ $(SOLARLIBDIR)$/expat_xmlparse.lib\ $(SOLARLIBDIR)$/expat_xmltok.lib .ENDIF @@ -115,7 +115,7 @@ SLOFILES_X64= \ $(SLO_X64)$/stream_helper.obj\ SHL1TARGET_X64=$(TARGET) -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ +SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/$(ZLIB3RDLIB)\ $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ $(SOLARLIBDIR_X64)$/expat_xmltok.lib diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk index 08adff7bfe3b..68c65b289a69 100644 --- a/shell/source/win32/shlxthandler/propsheets/makefile.mk +++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk @@ -44,10 +44,6 @@ CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS_X64+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501 .ENDIF -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/propsheets.obj\ diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk index e2b7a8294319..f2edb7f3719e 100644 --- a/shell/source/win32/shlxthandler/util/makefile.mk +++ b/shell/source/win32/shlxthandler/util/makefile.mk @@ -47,10 +47,6 @@ CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/fileextensions.obj\ |