cleanup code

open-watcom · Dec 31, 2021 · 913d7b3 · 913d7b3
1 parent a84def9
commit 913d7b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 174 deletions.
diff --git a/bld/as/master.mif b/bld/as/master.mif
@@ -191,13 +191,13 @@ wresui.res : $(as_dir)/h/as.rc msg.grh usage.gh $(__MAKEFILES__)
 
 msg.grh : $(as_dir)/h/as.msg $(__MAKEFILES__)
     @%make echo_cpp
-    $(cpp) $(rc_ui_flags) $(cppflags) -D_STANDALONE_ -omsg.tmp $[@
+    $(cpp) -zku8 $(rc_cppflags) $(cppflags) -D_STANDALONE_ -omsg.tmp $[@
     @%make echo_awk
     $(awk) -v base=MSG_AS_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. msg.tmp
 
 asi_msg.grh : $(as_dir)/h/as.msg $(__MAKEFILES__)
     @%make echo_cpp
-    $(cpp) $(rc_ui_flags) $(cppflags) -oasi_msg.tmp $[@
+    $(cpp) -zku8 $(rc_cppflags) $(cppflags) -oasi_msg.tmp $[@
     @%make echo_awk
     $(awk) -v base=MSG_AS_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. asi_msg.tmp
 

diff --git a/bld/uninstal/master.mif b/bld/uninstal/master.mif
@@ -42,7 +42,7 @@ exetarg_nt_manif_x64  = ntmanif.res
 
 $(proj_name).res : ../uninstal.rc $(__MAKEFILES__) .AUTODEPEND
     @%make echo_rc
-    $(rc) $(rc_flags) -ad -zk0 $(inc_path) $[@ -fo=$@
+    $(rc) $(rc_flags) -ad -zku8 $(inc_path) $[@ -fo=$@
 
 ntmanif.res : ../ntmanif.rc
     @%make echo_rc
@@ -54,4 +54,4 @@ rcstr.grh : rcstrmsg.gh $(__MAKEFILES__)
 
 rcstrmsg.gh : $(uninstal_dir)/uninstal.msg $(__MAKEFILES__)
     @%make echo_cpp
-    $(cpp) $(rc_ui_flags) $(inc_path) -o$@ $[@
+    $(cpp) -zku8 $(rc_cppflags) $(inc_path) -o$@ $[@
diff --git a/bld/uninstal/uninstal.msg b/bld/uninstal/uninstal.msg
@@ -1,3 +1,5 @@
+/* UTF-8 encoding, ¥ */
+
 pick(   UNINS_TITLE,
         "Open Watcom",
         "Open Watcom" )

diff --git a/bld/wsample/h/usage.msg b/bld/wsample/h/usage.msg