[Libreoffice-commits] .: xmlhelp/source xmlhelp/util

[Jesús Corrius]

 xmlhelp/source/cxxhelp/provider/makefile.mk |    2 ++
 xmlhelp/source/cxxhelp/qe/makefile.mk       |    2 ++
 xmlhelp/source/cxxhelp/util/makefile.mk     |    2 ++
 xmlhelp/util/makefile.mk                    |    2 ++
 4 files changed, 8 insertions(+)

New commits:
commit 4692766ce56196652336e54b271fceced6785671
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Fri Jun 24 13:18:13 2011 +0200

    mingw32-gcc doesn't support the cl.exe GR option

diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
index cc8eaf9..55b3589 100755
--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
+++ b/xmlhelp/source/cxxhelp/provider/makefile.mk
@@ -69,8 +69,10 @@ CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
 .ENDIF
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="MSC"
 CFLAGS+=-GR
 .ENDIF
+.ENDIF
 
 # --- General -----------------------------------------------------
 
diff --git a/xmlhelp/source/cxxhelp/qe/makefile.mk b/xmlhelp/source/cxxhelp/qe/makefile.mk
index e55bb9e..db3502d 100755
--- a/xmlhelp/source/cxxhelp/qe/makefile.mk
+++ b/xmlhelp/source/cxxhelp/qe/makefile.mk
@@ -38,8 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :	settings.mk
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="MSC"
 CFLAGS+=-GR
 .ENDIF
+.ENDIF
 
 SLOFILES=$(SLO)$/DocGenerator.obj
 
diff --git a/xmlhelp/source/cxxhelp/util/makefile.mk b/xmlhelp/source/cxxhelp/util/makefile.mk
index a375e7d..28e625a 100755
--- a/xmlhelp/source/cxxhelp/util/makefile.mk
+++ b/xmlhelp/source/cxxhelp/util/makefile.mk
@@ -38,8 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :	settings.mk
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="MSC"
 CFLAGS+=-GR
 .ENDIF
+.ENDIF
 
 SLOFILES=\
         $(SLO)$/Decompressor.obj
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
index 5e1a85f..880bdb2 100755
--- a/xmlhelp/util/makefile.mk
+++ b/xmlhelp/util/makefile.mk
@@ -42,8 +42,10 @@ NO_BSYMBOLIC=TRUE
 .INCLUDE: settings.mk
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="MSC"
 CFLAGS+=-GR
 .ENDIF
+.ENDIF
 
 # --- Shared-Library ---------------------------------------------------