diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:50:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:50:21 +0000 |
| commit | 23ad4d09438ad53891cc7177eea2230ab1b4237b (patch) | |
| tree | 0a02fc06630335842a4e7c1f5efbfd657c1f3b86 /shell | |
| parent | d4a4221e66a281cd19b9bb075c4eb23ad82f291d (diff) | |
INTEGRATION: CWS mingwport03 (1.8.100); FILE MERGED
2007/03/19 15:38:31 vg 1.8.100.3: RESYNC MERGED 1.8 1.9
Everything below this line will be added to the revision comment.
2006/10/24 13:48:45 vg 1.8.100.2: #i53572# MinGW port
2006/09/19 11:53:54 vg 1.8.100.1: #i53572# MinGW port
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/win32/shlxthandler/makefile.mk | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index 8175c942bb53..e4824263de4a 100644 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: hr $ $Date: 2007-01-02 16:12:27 $ +# last change: $Author: vg $ $Date: 2007-03-26 13:50:21 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -61,20 +61,26 @@ SLOFILES=$(SLO)$/classfactory.obj\ SHL1TARGET=$(TARGET) -SHL1STDLIBS=uwinapi.lib\ - oleaut32.lib\ - advapi32.lib\ - ole32.lib\ - uuid.lib\ - shell32.lib\ - kernel32.lib\ - gdi32.lib\ - gdiplus.lib - +.IF "$(COM)"=="GCC" +SHL1STDLIBS=$(ZLIB3RDLIB) $(EXPAT3RDLIB) +SHL1LIBS= +.ELSE +SHL1STDLIBS= SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ $(SOLARLIBDIR)$/expat_xmlparse.lib\ - $(SOLARLIBDIR)$/expat_xmltok.lib\ - $(SLB)$/util.lib\ + $(SOLARLIBDIR)$/expat_xmltok.lib +.ENDIF +SHL1STDLIBS+=$(UWINAPILIB)\ + $(OLEAUT32LIB)\ + $(ADVAPI32LIB)\ + $(OLE32LIB)\ + $(UUIDLIB)\ + $(SHELL32LIB)\ + $(KERNEL32LIB)\ + $(GDI32LIB)\ + $(GDIPLUSLIB) + +SHL1LIBS+=$(SLB)$/util.lib\ $(SLB)$/ooofilereader.lib SHL1DEPN= |