diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-20 23:39:05 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-21 00:02:11 +0300 |
commit | a65ee94f902e0caddaeaabf6ca0a4c1269d02869 (patch) | |
tree | 77626d1e7d9c1751d3753e414d508d5f561dbb9e | |
parent | Use the expected import library name for WNTGCC (diff) | |
download | core-a65ee94f902e0caddaeaabf6ca0a4c1269d02869.tar.gz core-a65ee94f902e0caddaeaabf6ca0a4c1269d02869.zip |
MinGW fixup
Don't use any i prefix for import library, and deliver it.
-rw-r--r-- | xmlreader/prj/d.lst | 1 | ||||
-rw-r--r-- | xmlreader/source/makefile.mk | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst index 37abb60b8341..f850331df026 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 cb71e21a16b1..1f5f98eae7d7 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 = \ |