SF.net SVN: ant-contrib: [156] cpptasks/trunk/src/main/java/net/sf/ antcontrib/cpptasks/gcc/WindresResourceCompiler.java

[email protected] Wed, 20 Feb 2008 22:44:25 -0800
Newsgroups gmane.comp.java.ant-contrib.devel
Message-ID <[email protected]>
Revision: 156
          http://ant-contrib.svn.sourceforge.net/ant-contrib/?rev=156&view=rev
Author:   carnold
Date:     2008-02-20 22:44:23 -0800 (Wed, 20 Feb 2008)

Log Message:
-----------
Now with working Windres compiler

Modified Paths:
--------------
    cpptasks/trunk/src/main/java/net/sf/antcontrib/cpptasks/gcc/WindresResourceCompiler.java

Modified: cpptasks/trunk/src/main/java/net/sf/antcontrib/cpptasks/gcc/WindresResourceCompiler.java
===================================================================
--- cpptasks/trunk/src/main/java/net/sf/antcontrib/cpptasks/gcc/WindresResourceCompiler.java	2008-02-20 04:19:54 UTC (rev 155)
+++ cpptasks/trunk/src/main/java/net/sf/antcontrib/cpptasks/gcc/WindresResourceCompiler.java	2008-02-21 06:44:23 UTC (rev 156)
@@ -39,8 +39,8 @@
         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 @@
             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;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/