diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-21 02:29:08 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-21 02:29:08 +0300 |
| commit | 62467741ecf1360cfe89c656c9310feab530ae44 (patch) | |
| tree | 36278f30fa8d9a6891e15f649837e5250fed9ebf /regexp | |
| parent | a31a128023dbf29d3493417c06a9e3516067add9 (diff) | |
Use the import library name that i18npool expects with MinGW
Diffstat (limited to 'regexp')
| -rw-r--r-- | regexp/prj/d.lst | 1 | ||||
| -rw-r--r-- | regexp/source/makefile.mk | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/regexp/prj/d.lst b/regexp/prj/d.lst index fadeaf70053d..0408e36f30c6 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 7aa2a2eaa03b..b1ebf69224cf 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) |