diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:28:13 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:28:13 +0000 |
| commit | 7a1eb6d698a62224dd17b92124f4d90285226fef (patch) | |
| tree | adc6b0a87c2c27fe3375f4736efd2f1ccb1e0700 /odk/source | |
| parent | 7686f9893a8da80eeec2be22f325f8ce99193e23 (diff) | |
INTEGRATION: CWS mingwport03 (1.4.64); FILE MERGED
2007/03/19 15:31:45 vg 1.4.64.3: RESYNC: (1.7-1.9); FILE MERGED
2006/11/08 12:44:33 vg 1.4.64.2: RESYNC: (1.4-1.7); FILE MERGED
2006/09/06 15:40:25 vg 1.4.64.1: #i53572# MinGW port
Diffstat (limited to 'odk/source')
| -rw-r--r-- | odk/source/unowinreg/win/makefile.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk index d823277452af..c9d88e1058ea 100644 --- a/odk/source/unowinreg/win/makefile.mk +++ b/odk/source/unowinreg/win/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: vg $ $Date: 2007-02-06 13:23:00 $ +# last change: $Author: vg $ $Date: 2007-03-26 13:28:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -98,11 +98,15 @@ SHL1TARGET=$(TARGET) SHL1LIBS=$(SLB)$/$(TARGET).lib #No default libraries +.IF "$(COM)"=="GCC" +STDSHL=-lmingw32 -lmsvcrt +.ELSE STDSHL= +.ENDIF SHL1STDLIBS +=\ - kernel32.lib\ - advapi32.lib + $(KERNEL32LIB)\ + $(ADVAPI32LIB) SHL1DEF=$(MISC)$/$(SHL1TARGET).def |