[Libreoffice-commits] .: 2 commits - autodoc/source udm/source

[Tor Lillqvist]

 autodoc/source/mkinc/fullcpp.mk |    2 +-
 udm/source/mkinc/fullcpp.mk     |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit fb0c6399c7e84e5264f3cea2cdc4868b22fe5a8a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 00:29:52 2011 +0300

    Use a MSVC-specific option only when $(COM)==MSC

diff --git a/autodoc/source/mkinc/fullcpp.mk b/autodoc/source/mkinc/fullcpp.mk
index c7519d8..00f08bd 100644
--- a/autodoc/source/mkinc/fullcpp.mk
+++ b/autodoc/source/mkinc/fullcpp.mk
@@ -32,7 +32,7 @@
 
 
 # RTTI
-.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="MSC"
 CFLAGS+= -GR
 .ENDIF
 .IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \
commit 49c7438bdf3c896ffd474cacbb9e588690ea2da6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 17 23:48:45 2011 +0300

    Fix build with MinGW

diff --git a/udm/source/mkinc/fullcpp.mk b/udm/source/mkinc/fullcpp.mk
index 3452d4b..5faca9c 100644
--- a/udm/source/mkinc/fullcpp.mk
+++ b/udm/source/mkinc/fullcpp.mk
@@ -37,7 +37,9 @@
 .IF "$(GUI)"=="WNT"
 
 # RTTI
+.IF "$(COM)"=="MSC"
 CFLAGS+= -GR
+.ENDIF
 
 .IF "$(NP_LOCALBUILD)"!=""
 
@@ -54,7 +56,8 @@ CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBU
 
 .ENDIF
 
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
+# Or should we simple check for $(COM)==GCC ?
+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)$(COM)"=="WNTGCC"
 CFLAGSCXX+= -frtti
 .ENDIF