[Libreoffice-commits] .: 4 commits - jurt/source jvmaccess/util jvmfwk/source xmlreader/prj xmlreader/source

[Tor Lillqvist]

 jurt/source/pipe/wrapper/wrapper.c |    2 +-
 jvmaccess/util/makefile.mk         |    4 ++++
 jvmfwk/source/makefile.mk          |    4 ++++
 xmlreader/prj/d.lst                |    1 +
 xmlreader/source/makefile.mk       |    4 ++++
 5 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit c0f66f4d1c8f3d244e7f1155acf93b7bf7688588
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 20 23:48:27 2011 +0300

    No i prefix for import library with MinGW thanks

diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk
index bc067a1..76ae22d 100644
--- a/jvmfwk/source/makefile.mk
+++ b/jvmfwk/source/makefile.mk
@@ -58,7 +58,11 @@ SHL1TARGET = $(FRAMEWORKLIB)
 .ENDIF # UNIXVERSIONNAMES
 
 SHL1DEPN=
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB = i$(FRAMEWORKLIB)
+.ELSE
+SHL1IMPLIB = $(FRAMEWORKLIB)
+.ENDIF
 SHL1LIBS = $(SLB)$/$(TARGET).lib
 SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB)
 SHL1RPATH = URELIB
commit c3e2eaa7d44189b566d13fc925c18b4e68583584
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 20 23:39:05 2011 +0300

    MinGW fixup
    
    Don't use any i prefix for import library, and deliver it.

diff --git a/xmlreader/prj/d.lst b/xmlreader/prj/d.lst
index 37abb60..f850331 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 cb71e21..1f5f98e 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 = \
commit 336a8a1eeeccae3d55a7ee65eda5c0f465b44ec3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 20 23:04:43 2011 +0300

    Use the expected import library name for WNTGCC

diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk
index 048a804..16a6d85 100644
--- a/jvmaccess/util/makefile.mk
+++ b/jvmaccess/util/makefile.mk
@@ -43,7 +43,11 @@ SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)
 SHL1TARGET = $(TARGET)$(COMID)
 .ENDIF # UNIXVERSIONNAMES
 
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB = i$(TARGET)
+.ELSE
+SHL1IMPLIB = $(TARGET)$(UDK_MAJOR)$(COMID)
+.ENDIF
 SHL1LIBS = $(SLB)$/$(TARGET).lib
 SHL1STDLIBS = $(CPPULIB) $(SALLIB) $(SALHELPERLIB)
 .IF "$(OS)" == "WNT"
commit 4e629350761ac1686b4adeb270d7b3fcfce693df
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 20 22:54:41 2011 +0300

    It's <windows.h>, not <Windows.h>

diff --git a/jurt/source/pipe/wrapper/wrapper.c b/jurt/source/pipe/wrapper/wrapper.c
index 0db29e4..2d94899 100644
--- a/jurt/source/pipe/wrapper/wrapper.c
+++ b/jurt/source/pipe/wrapper/wrapper.c
@@ -30,7 +30,7 @@
 
 #include <stddef.h>
 
-#include <Windows.h>
+#include <windows.h>
 
 #include "jni.h"
 #include "sal/types.h"