diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:10:56 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:10:56 +0000 |
| commit | bedc35d6275ca5da5653b1f39283f78ca7257ba9 (patch) | |
| tree | 68bb883cd9771d6710f5dd76f95365599e71db00 /setup_native | |
| parent | f1e82cf2263e6705e6c1eef35a7b0c9a3b8c362e (diff) | |
INTEGRATION: CWS mingwport03 (1.3.24); FILE MERGED
2007/03/19 17:03:23 vg 1.3.24.2: RESYNC: (1.3-1.4); FILE MERGED
2006/09/18 15:10:57 vg 1.3.24.1: #i53572# MinGW port
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/win32/customactions/regpatchactivex/makefile.mk | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk index bd32569f4e57..bcd7d396098d 100644 --- a/setup_native/source/win32/customactions/regpatchactivex/makefile.mk +++ b/setup_native/source/win32/customactions/regpatchactivex/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: vg $ $Date: 2007-02-06 13:53:11 $ +# last change: $Author: vg $ $Date: 2007-03-26 14:10:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -58,13 +58,20 @@ INCPRE+=.\Include SLOFILES = $(SLO)$/regpatchactivex.obj -SHL1STDLIBS= kernel32.lib\ - user32.lib\ - advapi32.lib\ - shell32.lib\ - msi.lib\ - libcmt.lib -# msvcrt.lib +.IF "$(COM)"=="GCC" +SHL1STDLIBS= -lmingw32 -lstdc++ -lgcc -lmingwthrd -lmsvcrt +.ELSE +SHL1STDLIBS= +.ENDIF + +SHL1STDLIBS+= $(KERNEL32LIB)\ + $(USER32LIB)\ + $(ADVAPI32LIB)\ + $(SHELL32LIB)\ + $(MSILIB) +.IF "$(COM)"!="GCC" +SHL1STDLIBS+= libcmt.lib +.ENDIF SHL1LIBS = $(SLB)$/$(TARGET).lib |