Changeset 3290

Timestamp:

May 5, 2007, 6:42:47 PM (18 years ago)

Author:

bird

Message:

Fixed rc.exe bustage introduced by Yuri's wrc patch. And applied a patch fixing a problem with wrc and response files. Ref #159.

Files:

• branches/libc-0.6/src/emx/src/emxomf/emxomfld.c (modified) (2 diffs)
• trunk/emx/src/emxomf/emxomfld.c (modified) (2 diffs)

branches/libc-0.6/src/emx/src/emxomf/emxomfld.c

@@ -2343 +2343 @@
                          "*** Resource compiler type: %s\n", rc_name, rc_type);
 
-      if (!stricmp (linker_type, "RC"))
+      if (!stricmp (rc_type, "RC"))
         {
           arg_init (TRUE);
@@ -2360 +2360 @@
       else
         {
-          arg_init (FALSE);
-          put_arg (rc_name, TRUE, FALSE);
-          put_arg ("-q", FALSE, FALSE);
-          put_arg (res_fname, TRUE, FALSE);
-          put_arg (output_fname, TRUE, FALSE);
-          arg_end ();
-          rc = emxomfld_spawn (command_line, "Resource Linker");
+          /* wrc doesn't understand response files and put_arg handles max 110 chars */
+          rc = spawnlp (P_WAIT, rc_name, rc_name, "-q", res_fname, output_fname, NULL);
           if (rc < 0)
             {

trunk/emx/src/emxomf/emxomfld.c

@@ -2343 +2343 @@
                          "*** Resource compiler type: %s\n", rc_name, rc_type);
 
-      if (!stricmp (linker_type, "RC"))
+      if (!stricmp (rc_type, "RC"))
         {
           arg_init (TRUE);
@@ -2360 +2360 @@
       else
         {
-          arg_init (FALSE);
-          put_arg (rc_name, TRUE, FALSE);
-          put_arg ("-q", FALSE, FALSE);
-          put_arg (res_fname, TRUE, FALSE);
-          put_arg (output_fname, TRUE, FALSE);
-          arg_end ();
-          rc = emxomfld_spawn (command_line, "Resource Linker");
+          /* wrc doesn't understand response files and put_arg handles max 110 chars */
+          rc = spawnlp (P_WAIT, rc_name, rc_name, "-q", res_fname, output_fname, NULL);
           if (rc < 0)
             {