[Libreoffice-commits] .: regexp/prj regexp/source
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Jun 20 16:29:36 PDT 2011
regexp/prj/d.lst | 1 +
regexp/source/makefile.mk | 4 ++++
2 files changed, 5 insertions(+)
New commits:
commit 2da23dce1c6725f057609ba08bd3898e19bc4647
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jun 21 02:29:08 2011 +0300
Use the import library name that i18npool expects with MinGW
diff --git a/regexp/prj/d.lst b/regexp/prj/d.lst
index fadeaf7..0408e36 100644
--- a/regexp/prj/d.lst
+++ b/regexp/prj/d.lst
@@ -5,4 +5,5 @@ mkdir: %_DEST%\inc\external\regexp
..\%__SRC%\bin\i18nrege*.dll %_DEST%\bin\i18nrege*.dll
..\%__SRC%\lib\libi18nregexp*.so %_DEST%\lib\libi18nregexp*.so
..\%__SRC%\lib\libi18nregexp*.dylib %_DEST%\lib\libi18nregexp*.dylib
+..\%__SRC%\lib\libi18nregexp*.dll.a %_DEST%\lib\libi18nregexp*.dll.a
..\%__SRC%\lib\ii18nregexp.lib %_DEST%\lib\ii18nregexp.lib
diff --git a/regexp/source/makefile.mk b/regexp/source/makefile.mk
index 7aa2a2e..b1ebf69 100644
--- a/regexp/source/makefile.mk
+++ b/regexp/source/makefile.mk
@@ -44,7 +44,11 @@ SLOFILES= \
$(EXCEPTIONSFILES)
SHL1TARGET= $(TARGET)$(COMID)
+.IF "$(COM)" == "MSC"
SHL1IMPLIB= i$(TARGET)
+.ELSE
+SHL1IMPLIB = $(TARGET)$(COMID)
+.ENDIF
DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
More information about the Libreoffice-commits
mailing list