ow-build: correct build make files for qnx build

winspool · Jun 9, 2024 · bdec97b · bdec97b
1 parent fb47d32
commit bdec97b
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 14 deletions.
diff --git a/bld/cc/master.mif b/bld/cc/master.mif
@@ -225,6 +225,6 @@ optencod_targets = $(target_cpu) $(host_os)
 optencod_targets += dbg
 !endif
 
-cmdlnprs.gh cmdlnprs.gc usage.gh usage01.int $(qnx_usage): ../../gml/options.gml
+cmdlnprs.gh cmdlnprs.gc usage.gh usage01.int $(qnx_usage) : ../../gml/options.gml
     @%make echo_optencod
     $(optencod) -i -n $(optencod_opt_$(host_os)) $(optencod_enc_$(host_os)) $]@ cmdlnprs.gh cmdlnprs.gc usage.gh . $(optencod_targets)
diff --git a/bld/f77/wfc/master.mif b/bld/f77/wfc/master.mif
@@ -123,7 +123,7 @@ wfcmsgs.gh wfcmsgs.grh wfcgrps.gh wfcattrs.gh : $(f77wfc_dir)/gml/wfcmsgs.gml
     @%make echo_msgencod
     $(noecho)*msgencod -q -s -ip -rc=MSG_LANG_BASE -utf8 $(msgencod_enc_$(host_os)) $[@ wfcmsgs.gh wfcmsgs.grh wfcgrps.gh wfcattrs.gh
 
-# .gh options and targets for various hosts
+# optencod options and targets for various hosts
 #optencod_enc_linux  = -utf8
 
 optencod_targets = $(target_cpu) $(host_os)

diff --git a/bld/mad/master.mif b/bld/mad/master.mif
@@ -91,9 +91,6 @@ additional_clean += *$(dlltarg_ext)
 #
 dlltarg_prebuild_objs = $(dis_prereq)
 dlltarg_objs          = madimp.obj $(dis_objs) $(imp_objs)
-!ifdef ntverrc_dll_out
-dlltarg_res = $(ntverrc_dll_out)
-!endif
 !include dlltarg.mif
 
 #

diff --git a/bld/ndisasm/master.mif b/bld/ndisasm/master.mif
@@ -102,11 +102,14 @@ msg.grh : ../stand/wdis.msg $(__MAKEFILES__)
     @%make echo_awk
     $(noecho)*awk -v base=WDIS_LITERAL_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. $[@
 
+# optencod options and targets for various hosts
+#optencod_enc_linux  = -utf8
+
 optencod_targets = $(host_os)
 !ifeq debug 2
 optencod_targets += dbg
 !endif
 
-usage.gh $(qnx_usage): ../stand/options.gml $(__MAKEFILES__)
+usage.gh $(qnx_usage) : ../stand/options.gml $(__MAKEFILES__)
     @%make echo_optencod
     $(optencod) -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ . $(optencod_targets)
diff --git a/bld/nwlib/master.mif b/bld/nwlib/master.mif
@@ -182,6 +182,9 @@ msg.grh :  ../h/wlib.msg $(__MAKEFILES__)
     @%make echo_awk
     $(noecho)*awk -v base=MSG_RC_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. $[@
 
+# optencod options and targets for various hosts
+#optencod_enc_linux  = -utf8
+
 optencod_targets = $(host_os)
 !ifeq debug 2
 optencod_targets += dbg

diff --git a/bld/rc/rc/c/scan2.c b/bld/rc/rc/c/scan2.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2023 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -121,7 +121,7 @@ static YYTOKENTYPE  scanCPPDirective( ScanValue *value )
  * This function takes the correct action for the #line directive and returns
  * the token following the preprocessor stuff. It uses Scan to do it's
  * scanning. DON'T call this function from within Scan or the functions it
- * calls unless you are very careful about recurtion.
+ * calls unless you are very careful about recursion.
  */
 {
     YYTOKENTYPE token;

diff --git a/bld/wl/master.mif b/bld/wl/master.mif
@@ -16,6 +16,8 @@ wlink_trmem = 1
 wlink_wreslib_cli = text
 wlink_wreslib_incl = 1
 
+wlink_qnx_usage = 1
+
 # Base DLL name needs to be 8 chars or less on OS/2, argh! Additionally,
 # internal module name may be required to match file name on some platforms.
 !ifdef bootstrap
@@ -106,7 +108,6 @@ exetarg_objs          = $(comp_objs_exe)
 exetarg_libs          = $(wlink_libs)
 !endif
 exetarg_res           = wresexe.res
-exetarg_qnx_res       = usage.u
 !include exetarg.mif
 
 #
@@ -137,6 +138,8 @@ rcmsg.grh : $(wrc_dir)/h/rc.msg $(__MAKEFILES__)
     @%make echo_awk
     $(noecho)*awk -v base=MSG_RC_BASE -f $(build_dir)/makemsg.awk -v OUTFILE=$^. $[@
 
-usage.u : $(wlink_dir)/h/usage.sp $(__MAKEFILES__)
+!ifdef qnx_usage
+$(qnx_usage) : $(wlink_dir)/h/usage.sp $(__MAKEFILES__)
     @%make echo_wsplice
     $(noecho)*wsplice -u $[@ $@
+!endif
diff --git a/bld/wprof/master.mif b/bld/wprof/master.mif
@@ -9,6 +9,8 @@ wprof_trmem = 1
 
 wprof_wreslib_cli = gui
 
+wprof_qnx_usage = 1
+
 additional_clean = *.grc
 
 !include cproj.mif
@@ -78,7 +80,6 @@ exetarg_prebuild_objs = $(extra_link_res_$(host_os)) $(resfile)
 exetarg_objs          = $(objs) $(sys_objs)
 exetarg_libs          = $(cli_aui_libs) $(sys_libs)
 exetarg_res           = $(proj_name).res
-exetarg_qnx_res       = usage.u
 !include exetarg.mif
 
 #
@@ -99,6 +100,8 @@ $(proj_name).res : ../res/wprof.rc $(cli_aui_rc_deps) $(__MAKEFILES__) .AUTODEPE
     @%make echo_rc
     $(rcu8) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 
-usage.u : ../h/usage.sp $(__MAKEFILES__)
+!ifdef qnx_usage
+$(qnx_usage) : ../h/usage.sp $(__MAKEFILES__)
     @%make echo_wsplice
     $(noecho)*wsplice -u $[@ $@
+!endif
diff --git a/bld/wv/master.mif b/bld/wv/master.mif
@@ -19,6 +19,8 @@ wv_wreslib_cli = gui
 
 wv_dos_extender = dos4g	#causeway
 
+wv_qnx_usage = 1
+
 !ifdef sys_windowed
 !ifeq host_os os2
 wv_os2pm = 1
@@ -145,7 +147,6 @@ exetarg_name          = $(wv_engine_noui)
 exetarg_prebuild_objs = liteng.gh litdui.gh litmenu.gh usage.gh usagej.gh
 exetarg_objs          = $(engine_objs) fingmsg.obj $(ui_objs)
 exetarg_libs          = $(cli_aui_libs)
-exetarg_qnx_res       = usage.u
 exetarg_name          = $(name)
 !endif
 exetarg_res           = $(proj_name).res
@@ -448,6 +449,8 @@ usagej.gh : ../../h/usage.sp $(__MAKEFILES__)
     @%make echo_wsplice
     $(noecho)*wsplice -kJAPANESE -k$(host_os) $(wsplice_keys) -t8 -f "pick((MSG_USAGE_BASE+%$#%+), \"\", \"%s\")" $[@ $@
 
-usage.u : ../../h/usage.sp $(__MAKEFILES__)
+!ifdef qnx_usage
+$(qnx_usage) : ../../h/usage.sp $(__MAKEFILES__)
     @%make echo_wsplice
     $(noecho)*wsplice -u -kENGLISH -k$(host_os) -kLINKRES $[@ $@
+!endif