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, 8 insertions, 0 deletions

diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
index 0fce11b..560b608 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
@@ -142,9 +142,17 @@ public abstract class GccCompatibleCCompiler extends CommandLineCCompiler {
     protected File[] getEnvironmentIncludePath() {
         return CUtil.getPathFromEnvironment("INCLUDE", ":");
     }
+    // Darren Sargent 22Oct2008 - added overloads to properly handle system paths
     public String getIncludeDirSwitch(String includeDir) {
+    	return getIncludeDirSwitch(includeDir, false);
+    }
+    public String getIncludeDirSwitch(String includeDir, boolean isSystem) {
+    	if ( isSystem ) {
+    		return "-isystem" + includeDir;
+    	} else {
         return "-I" + includeDir;
     }
+    }
     public void getUndefineSwitch(StringBuffer buffer, String define) {
         buffer.append("-U");
         buffer.append(define);