summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-03-26 12:43:30 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-03-26 12:43:30 +0000
commit820a08c1d45ea04845624489fd3b32f486e68f6e (patch)
tree3899f57530c1def0eb999ba36c880b186502a54d /embeddedobj
parent331efc17ee25d4690622345b44e5c1f30a7ae558 (diff)
INTEGRATION: CWS mingwport03 (1.10.34); FILE MERGED
2006/11/07 17:30:00 vg 1.10.34.2: RESYNC: (1.10-1.11); FILE MERGED 2006/09/06 16:08:31 vg 1.10.34.1: #i53572# MinGW port
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/msole/makefile.mk19
1 files changed, 12 insertions, 7 deletions
diff --git a/embeddedobj/source/msole/makefile.mk b/embeddedobj/source/msole/makefile.mk
index c1e83de1c81b..8aea5dcc1ece 100644
--- a/embeddedobj/source/msole/makefile.mk
+++ b/embeddedobj/source/msole/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.12 $
#
-# last change: $Author: vg $ $Date: 2006-09-25 13:01:51 $
+# last change: $Author: vg $ $Date: 2007-03-26 13:43:30 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -106,14 +106,19 @@ SHL1STDLIBS=\
$(SVTOOLLIB)
.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+EMBOBJLIB=-lembobj
+.ELSE
+EMBOBJLIB=iembobj.lib
+.ENDIF
SHL1STDLIBS+=\
$(VCLLIB)\
- iembobj.lib\
- ole32.lib\
- gdi32.lib\
- uuid.lib\
- oleaut32.lib
+ $(EMBOBJLIB)\
+ $(OLE32LIB)\
+ $(GDI32LIB)\
+ $(UUIDLIB)\
+ $(OLEAUT32LIB)
DEF1EXPORTFILE= exports.dxp
.ELSE