diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 14:06:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 14:06:55 +0100 |
| commit | 3934efe28c70b1c21a60f38fe726a935c15f4e99 (patch) | |
| tree | c322f38a215b05ff0c457366e08fab9255b64114 /shell/source/win32/shlxthandler/makefile.mk | |
| parent | 134fe756a1659e352c96d0a6da34dd3c7d23e3a9 (diff) | |
sigh, need a 64bit zlib too on windows, reverting
Diffstat (limited to 'shell/source/win32/shlxthandler/makefile.mk')
| -rw-r--r-- | shell/source/win32/shlxthandler/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index b15f0ee0409b..81c3515b20b7 100644 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -59,6 +59,10 @@ 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\ @@ -78,7 +82,7 @@ SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) $(COMCTL32LIB) SHL1LIBS= .ELSE SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/$(ZLIB3RDLIB)\ +SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ $(SOLARLIBDIR)$/expat_xmlparse.lib\ $(SOLARLIBDIR)$/expat_xmltok.lib .ENDIF @@ -128,7 +132,7 @@ SLOFILES_X64= \ $(SLO_X64)$/stream_helper.obj\ SHL1TARGET_X64=$(TARGET) -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/$(ZLIB3RDLIB)\ +SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ $(SOLARLIBDIR_X64)$/expat_xmltok.lib |