Changeset 979 for trunk/tools

Timestamp:

Sep 18, 1999, 10:17:00 PM (26 years ago)

Author:

sandervl

Message:

Resource name bugfix

Location:

trunk/tools/wrc

Files:

• makefile.os2 (modified) (2 diffs)
• writeres.c (modified) (2 diffs)

trunk/tools/wrc/makefile.os2

@@ -1 @@
-!include ..\..\include\pdwin32.tools
+#!include ..\..\include\pdwin32.tools
 
 DEFS      = -D__WINE__ -D__WIN32OS2__ -idirafter ../../include/win -idirafter ../../include
@@ -46 +46 @@
 
 clean:
-        $(RM) *.o *.exe
+        rm *.o *.exe
 #       $(RM) y.tab.c y.tab.h lexyy.c *.o *.exe
 

trunk/tools/wrc/writeres.c

@@ -682 +682 @@
             {
                 char *label = prep_nid_for_label(rsc->name);
-                fprintf(fp, "\t"DIRECTIVE_LONG"\t(%s_%s_name - %s%s) "OR" "HEXBIT31"\n",
+                fprintf(fp, "\t"DIRECTIVE_LONG"\t(%s_%d_%s_name - %s%s) "OR" "HEXBIT31"\n",
                     prefix,
+                    rsc->type,
                     label,
                     prefix,
@@ -921 +922 @@
                 {
                     char *name = prep_nid_for_label(rsc->name);
-                    fprintf(fp, "%s_%s_name:\n",
-                        prefix,
-                        name);
+
+                    fprintf(fp, "%s_%d_%s_name:\n",
+                        prefix, rsc->type,
+                        name);
                     write_name_str(fp, rsc->name);
                 }