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 --- .../devstudio/VisualStudioNETProjectWriter.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java') diff --git a/src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java index f975f49..fd32619 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java @@ -200,12 +200,18 @@ public final class VisualStudioNETProjectWriter final CommandLineCompilerConfiguration compilerConfig) { File[] includePath = compilerConfig.getIncludePath(); StringBuffer includeDirs = new StringBuffer(); - for (int i = 0; i < includePath.length; i++) { - String relPath = CUtil.getRelativePath(baseDir, includePath[i]); - includeDirs.append(CUtil.toWindowsPath(relPath)); + // Darren Sargent Feb 10 2010 -- reverted to older code to ensure sys + // includes get, erm, included + String[] args = compilerConfig.getPreArguments(); + + for (int i = 0; i < args.length; i++) { + if (args[i].startsWith("/I")) { + includeDirs.append(args[i].substring(2)); includeDirs.append(';'); } + } + // end Darren if (includeDirs.length() > 0) { includeDirs.setLength(includeDirs.length() - 1); @@ -360,6 +366,11 @@ public final class VisualStudioNETProjectWriter if ("/W3".equals(args[i])) { warn = "3"; } + // Added by Darren Sargent, 2/26/2008 + if ("/W4".equals(args[i])) { + warn = "4"; + } + // end added } return warn; } -- cgit v1.2.3