summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/sf/antcontrib/cpptasks/borland
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-10-24 19:59:14 +0200
committerSven Gothel <[email protected]>2013-10-24 19:59:14 +0200
commita65cc99054a5a6684784bf9a9e8c13fe866b81ad (patch)
tree23348f898a34d48fb90ffeee67bf9660e68581bd /src/main/java/net/sf/antcontrib/cpptasks/borland
parent828c0e4ce45fb209ecf4355c8572ef3931228206 (diff)
Fix Bug 871 - Add optional xcode.clang support for all modules (Extends Bug 837 w/ xcode's xcrun)
Add 'isXCoderun' into the OO chain CommanLine[Compiler|Linker] up-to [Gcc|Gpp]Linker and GccCCompiler. Xcode's xcrun is now triggered via using the commands (linker and compiler): xcode.clang xcode.clang++ More could be added later .. +++ [Gcc|Gpp]Linker are derived from GnuLinker to reuse common code and to fix GppLinker (align to GccLinker). +++
Diffstat (limited to 'src/main/java/net/sf/antcontrib/cpptasks/borland')
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java2
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java2
-rw-r--r--src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
index 703ddd3..bdcd6f5 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
@@ -40,7 +40,7 @@ public class BorlandLibrarian extends CommandLineLinker {
}
private BorlandLibrarian() {
super("tlib", "--version", new String[]{".obj"}, new String[0], ".lib", false,
- null);
+ false, null);
}
protected void addBase(long base, Vector args) {
}
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
index 6a28805..8a5b13e 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
@@ -43,7 +43,7 @@ public final class BorlandLinker extends CommandLineLinker {
}
private BorlandLinker(String outputSuffix) {
super("ilink32", "-r", new String[]{".obj", ".lib", ".res"},
- new String[]{".map", ".pdb", ".lnk"}, outputSuffix, false, null);
+ new String[]{".map", ".pdb", ".lnk"}, outputSuffix, false, false, null);
}
protected void addBase(long base, Vector args) {
if (base >= 0) {
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
index debfa2b..501a871 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
@@ -43,8 +43,8 @@ public class BorlandResourceCompiler extends CommandLineCompiler {
}
private BorlandResourceCompiler(boolean newEnvironment, Environment env) {
super("brc32", "c:\\__bogus\\__bogus.rc", new String[]{".rc"},
- new String[]{".h", ".hpp", ".inl"}, ".res", false, null,
- newEnvironment, env);
+ new String[]{".h", ".hpp", ".inl"}, ".res", false, false,
+ null, newEnvironment, env);
}
protected void addImpliedArgs(final Vector args,
final boolean debug,