diff options
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/devstudio')
| -rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java | 5 | ||||
| -rw-r--r-- | src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java | 17 |
2 files changed, 19 insertions, 3 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); } 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; } |