summaryrefslogtreecommitdiffstats
path: root/src/net/sf/antcontrib/cpptasks/devstudio
diff options
context:
space:
mode:
authorslip_stream <[email protected]>2007-02-13 00:16:16 +0000
committerslip_stream <[email protected]>2007-02-13 00:16:16 +0000
commitde51c28eaf47d9e541835332b2c4d9f2f6f7666a (patch)
tree15972608d75e53c4a32dfc3f24620223945e2154 /src/net/sf/antcontrib/cpptasks/devstudio
parentd3131a4a8e0b8e8a28e3fbb79a20915050c5ec9f (diff)
Made changes to support a prefix for output libraries. Previously lib would be prepended to dynamic libraries by default. This is still the default behavior but now it can be overridded by specifying outputFilePrefix="<some value>" in the cc task.addPrefixParameter@78
git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/trunk/cpptasks@78 32d7a393-a5a9-423c-abd3-5d954feb1f2f
Diffstat (limited to 'src/net/sf/antcontrib/cpptasks/devstudio')
-rw-r--r--src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java2
-rw-r--r--src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java4
-rw-r--r--src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
index 985dfcf..f0f7bb8 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
@@ -30,7 +30,7 @@ import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
public abstract class DevStudioCompatibleLibrarian extends CommandLineLinker {
public DevStudioCompatibleLibrarian(String command, String identifierArg) {
super(command, identifierArg, new String[]{".obj"}, new String[0],
- ".lib", false, null);
+ "", ".lib", false, null);
}
protected void addBase(long base, Vector args) {
}
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
index c21a6f6..07a0aea 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
@@ -35,9 +35,9 @@ import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
*/
public abstract class DevStudioCompatibleLinker extends CommandLineLinker {
public DevStudioCompatibleLinker(String command, String identifierArg,
- String outputSuffix) {
+ String outputPrefix, String outputSuffix) {
super(command, identifierArg, new String[]{".obj", ".lib", ".res"},
- new String[]{".map", ".pdb", ".lnk", ".dll"}, outputSuffix,
+ new String[]{".map", ".pdb", ".lnk", ".dll"}, outputPrefix, outputSuffix,
false, null);
}
protected void addBase(long base, Vector args) {
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
index 826074b..be89bfa 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
@@ -30,7 +30,7 @@ public final class DevStudioLinker extends DevStudioCompatibleLinker {
return instance;
}
private DevStudioLinker(String outputSuffix) {
- super("link", "/DLL", outputSuffix);
+ super("link", "/DLL", "", outputSuffix);
}
public Linker getLinker(LinkType type) {
if (type.isSharedLibrary()) {