From cf6891934297c51cd12bac3278b6e59df5e42f06 Mon Sep 17 00:00:00 2001 From: Vikas Rangarajan Date: Tue, 23 Mar 2010 12:31:32 -0700 Subject: 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 --- .../antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java') 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); } -- cgit v1.2.3