Initial merge of local changes with master, main changes :

- Distinguish between system and non-system headers for compilers that support it (g++)
- only recurse dependencies for direct includes of current source

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
index cc4493d..cb378c0 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
@@ -92,6 +92,10 @@ public abstract class DevStudioCompatibleCCompiler
         args.addElement(mflag);
         if (rtti != null && rtti.booleanValue()) {
                 args.addElement("/GR");
+         } else {
+                // added by Darren Sargent, 21Mar2008 -- /GR is default so need
+                // /GR- to disable it
+                args.addElement("/GR-");
         }
     }
     protected void addDebugSwitch(Vector args) {
@@ -118,6 +122,7 @@ public abstract class DevStudioCompatibleCCompiler
         String[] additionalArgs = new String[]{
                 "/Fp" + CUtil.getBasename(prototype) + ".pch",
                 "/Yu" + lastInclude};
+
         return new CommandLineCompilerConfiguration(baseConfig, additionalArgs,
                 exceptFiles, false);
     }