summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesús Corrius <jesus@softcatala.org>2011-06-24 13:18:13 +0200
committerJesús Corrius <jesus@softcatala.org>2011-06-24 13:18:13 +0200
commitd9708d06a46e030720c58e1f2bc116aa76af8873 (patch)
treeb7845e8a0d2e0c5bad3481fc5a9f3bfd1208ea88
parent60acd685b2c7b1c91e09ac81732823e09b8db231 (diff)
mingw32-gcc doesn't support the cl.exe GR option
-rwxr-xr-xxmlhelp/source/cxxhelp/provider/makefile.mk2
-rwxr-xr-xxmlhelp/source/cxxhelp/qe/makefile.mk2
-rwxr-xr-xxmlhelp/source/cxxhelp/util/makefile.mk2
-rwxr-xr-xxmlhelp/util/makefile.mk2
4 files changed, 8 insertions, 0 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
index cc8eaf9355f0..55b35896447e 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 e55bb9eb3eab..db3502d31708 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 a375e7d55c09..28e625a445bd 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 5e1a85f85759..880bdb2c85bf 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 ---------------------------------------------------