[Libreoffice-commits] .: 2 commits - i18npool/source tools/source

[Tor Lillqvist]

 i18npool/source/isolang/makefile.mk |    4 ++++
 i18npool/source/paper/makefile.mk   |    4 ++++
 tools/source/fsys/wntmsc.hxx        |    4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 4247fe996fb36901c49bb8959d4ed1357feb63c4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jun 21 12:37:25 2011 +0300

    Use "Unix-style" (import) library names for MinGW, to match libs.mk

diff --git a/i18npool/source/isolang/makefile.mk b/i18npool/source/isolang/makefile.mk
index b8f0146..2ade308 100644
--- a/i18npool/source/isolang/makefile.mk
+++ b/i18npool/source/isolang/makefile.mk
@@ -43,7 +43,11 @@ SLOFILES=	$(SLO)$/insys.obj  \
             $(SLO)$/mslangid.obj
 
 SHL1TARGET=		$(ISOLANG_TARGET)$(ISOLANG_MAJOR)$(COMID)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=		i$(ISOLANG_TARGET)
+.ELSE
+SHL1IMPLIB=		$(ISOLANG_TARGET)$(ISOLANG_MAJOR)$(COMID)
+.ENDIF
 
 DEF1DEPN=		$(MISC)$/$(SHL1TARGET).flt
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
diff --git a/i18npool/source/paper/makefile.mk b/i18npool/source/paper/makefile.mk
index fa05cc2..f0b9bc8 100644
--- a/i18npool/source/paper/makefile.mk
+++ b/i18npool/source/paper/makefile.mk
@@ -44,7 +44,11 @@ SLOFILES=$(SLO)$/paper.obj
 SHL1OBJS=$(SLOFILES)
 
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+.IF "$(COM)" == "MSC"
 SHL1IMPLIB=i$(TARGET)
+.ELSE
+SHL1IMPLIB=$(TARGET)$(DLLPOSTFIX)
+.ENDIF
 
 DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
commit 73d6be4ef7671084053604d94d63e70ac3a5c494
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jun 21 12:34:30 2011 +0300

    Don't use backslashes in #include, eek

diff --git a/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index d50e969..fecbcd8 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.hxx
@@ -34,8 +34,8 @@
 #ifndef ICC
 #include <io.h>
 #endif
-#include <sys\types.h>
-#include <sys\stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <direct.h>
 
 #include <windows.h>