From a290048b6175ee1dbf9ecb2fe727a76c65e0f39d Mon Sep 17 00:00:00 2001 From: carnold Date: Thu, 21 Feb 2008 06:44:23 +0000 Subject: Now with working Windres compiler git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/cpptasks/trunk@156 32d7a393-a5a9-423c-abd3-5d954feb1f2f --- .../net/sf/antcontrib/cpptasks/gcc/WindresResourceCompiler.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/WindresResourceCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/WindresResourceCompiler.java index 2d598f5..a617024 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/WindresResourceCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/WindresResourceCompiler.java @@ -39,8 +39,8 @@ public final class WindresResourceCompiler extends CommandLineCompiler { return instance; } private WindresResourceCompiler(boolean newEnvironment, Environment env) { - super("rc", null, new String[]{".rc"}, new String[]{".h", ".hpp", - ".inl"}, ".res", false, null, newEnvironment, env); + super("windres", null, new String[]{".rc"}, new String[]{".h", ".hpp", + ".inl"}, ".o", false, null, newEnvironment, env); } protected void addImpliedArgs(final Vector args, final boolean debug, @@ -92,9 +92,7 @@ public final class WindresResourceCompiler extends CommandLineCompiler { int index) { if (index == 0) { String outputFileName = getOutputFileNames(filename, null)[0]; - String fullOutputName = new File(outputDir, outputFileName) - .toString(); - return "-o" + fullOutputName; + return "-o" + outputFileName; } return filename; } -- cgit v1.2.3