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

1 files changed, 3 insertions, 5 deletions

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;
     }