summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-06-20 23:39:05 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-06-21 00:02:11 +0300
commitc3e2eaa7d44189b566d13fc925c18b4e68583584 (patch)
treea140b9f0be6716c97924b8c671a53c9e5afe80d0
parent336a8a1eeeccae3d55a7ee65eda5c0f465b44ec3 (diff)
MinGW fixup
Don't use any i prefix for import library, and deliver it.
-rw-r--r--xmlreader/prj/d.lst1
-rw-r--r--xmlreader/source/makefile.mk4
2 files changed, 5 insertions, 0 deletions
diff --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst
index 37abb60b8..f850331df 100644
--- a/xmlreader/prj/d.lst
+++ b/xmlreader/prj/d.lst
@@ -2,6 +2,7 @@ mkdir: %_DEST%\inc\xmlreader
mkdir: %_DEST%\inc\xmlreader\detail
..\%__SRC%\bin\xmlreader.dll %_DEST%\bin\xmlreader.dll
..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib\ixmlreader.lib
+..\%__SRC%\lib\libxmlreader.dll.a %_DEST%\lib\libxmlreader.dll.a
..\%__SRC%\lib\libxmlreader.dylib %_DEST%\lib\libxmlreader.dylib
..\%__SRC%\lib\libxmlreader.so %_DEST%\lib\libxmlreader.so
..\inc\xmlreader\detail\xmlreaderdllapi.hxx %_DEST%\inc\xmlreader\detail\xmlreaderdllapi.hxx
diff --git a/xmlreader/source/makefile.mk b/xmlreader/source/makefile.mk
index cb71e21a1..1f5f98eae 100644
--- a/xmlreader/source/makefile.mk
+++ b/xmlreader/source/makefile.mk
@@ -41,7 +41,11 @@ SLOFILES = \
$(SLO)/span.obj \
$(SLO)/xmlreader.obj
+.IF "$(COM)" == "MSC"
SHL1IMPLIB = i$(SHL1TARGET)
+.ELSE
+SHL1IMPLIB= $(SHL1TARGET)
+.ENDIF
SHL1OBJS = $(SLOFILES)
SHL1RPATH = URELIB
SHL1STDLIBS = \