diff options
author | Vikas Rangarajan <vikas@vikas-linux.tva.tvworks.com> | 2010-03-23 12:31:32 -0700 |
---|---|---|
committer | Vikas Rangarajan <vikas@vikas-linux.tva.tvworks.com> | 2010-03-23 12:31:32 -0700 |
commit | cf6891934297c51cd12bac3278b6e59df5e42f06 (patch) | |
tree | 2de4867e2894d4c12c7c274f353737e7eea2dd93 /src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java | |
parent | 8e6ef7c8c3b8417c0d6ea4aae220b029977c2d34 (diff) | |
download | cpptasks-parallel-cf6891934297c51cd12bac3278b6e59df5e42f06.tar.gz cpptasks-parallel-cf6891934297c51cd12bac3278b6e59df5e42f06.tar.bz2 cpptasks-parallel-cf6891934297c51cd12bac3278b6e59df5e42f06.tar.xz cpptasks-parallel-cf6891934297c51cd12bac3278b6e59df5e42f06.zip |
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
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java')
-rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java | 17 |
1 files changed, 14 insertions, 3 deletions
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; } |