ow-build: correct build nt manifest resource file

open-watcom · Jun 8, 2024 · d2b74c0 · d2b74c0
1 parent 89d6bac
commit d2b74c0
Show file tree

Hide file tree

Showing 19 changed files with 105 additions and 99 deletions.
diff --git a/bld/appwiz/master.mif b/bld/appwiz/master.mif
@@ -1,5 +1,7 @@
 proj_name = appwiz
 
+appwiz_ntmanif = ../h
+
 !include cproj.mif
 !include defrule.mif
 !include deftarg.mif
@@ -28,14 +30,9 @@ exetarg_res           = $(proj_name).res
 #
 # rc and others
 #
-ntmanif_path = ../h
-!include ntmanif.mif
-
 rc_inc_dirs = -I"../h"
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntmanif_inc_dirs)
-
-$(proj_name).res : ../h/appwiz.rc $(ntmanif_deps) .AUTODEPEND
+$(proj_name).res : ../h/appwiz.rc .AUTODEPEND
     @%make echo_rc
     $(rc) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(rc_inc_path) $]@ -fo=$@
 

diff --git a/bld/bdiff/master.mif b/bld/bdiff/master.mif
@@ -4,6 +4,8 @@ bdiff_autodepend = .AUTODEPEND
 
 bdiff_wreslib_cli = text
 
+bdiff_ntmanif = ../h
+
 additional_clean = *.gh
 
 subdir_wcpatch  = wcpatch
@@ -138,13 +140,8 @@ exetarg_name        = bdiff
 #
 # rc and others
 #
-ntmanif_path = ../h
-!include ntmanif.mif
-
 rc_inc_dirs = -I..
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntmanif_inc_dirs)
-
 ppusage.gh : ../gml/optionsp.gml $(__MAKEFILES__)
     @%make echo_optencod
     $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ .
@@ -157,18 +154,18 @@ dusage.gh : ../gml/optionsi.gml $(__MAKEFILES__)
     @%make echo_optencod
     $(noecho)*optencod -q -rc=MSG_USAGE_BASE -utf8 $(optencod_opt_$(host_os)) $[@ . . $@ .
 
-bpatch.res : ../h/bpatch.rc ../h/bpatch.h ppusage.gh $(ntmanif_deps)
+bpatch.res : ../h/bpatch.rc ../h/bpatch.h ppusage.gh
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -DBPATCH $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 
-bdump.res : ../h/bpatch.rc ../h/bpatch.h pdusage.gh $(ntmanif_deps)
+bdump.res : ../h/bpatch.rc ../h/bpatch.h pdusage.gh
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -DBDUMP $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 
-bdiff.res : ../h/bpatch.rc ../h/bpatch.h dusage.gh $(ntmanif_deps)
+bdiff.res : ../h/bpatch.rc ../h/bpatch.h dusage.gh
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -DBDIFF $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 
-wpatch.res wcpatch.res : ../h/bpatch.rc ../h/bpatch.h $(ntmanif_deps)
+wpatch.res wcpatch.res : ../h/bpatch.rc ../h/bpatch.h
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) $(rc_flags) $(rc_inc_path) $[@ -fo=$@
diff --git a/bld/browser/master.mif b/bld/browser/master.mif
@@ -4,6 +4,8 @@ proj_name = browser
 browser_autodepends = .AUTODEPEND
 !endif
 
+browser_ntmanif = ../res
+
 browser_trmem = 1
 
 docs_host_dir = $(docs_dir)/$(host_os)
@@ -121,19 +123,17 @@ exetarg_name          = wbrw
 ntverrc_exe = $(exetarg_name)
 ntverrc_path = ../res
 !include ntverrc.mif
-ntmanif_path = ../res
-!include ntmanif.mif
 
 rc_inc_dirs = -I"../res/bmp" -I"../res/dlg" -I"../res/cur" -I"../res" -I"../h" -I"../res/ico" $(cli_wclass_rc_inc_dirs)
 
 !ifdef sys_windowed
 extra_rc_flags = -DRESX_GUI
 !endif
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntverrc_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt = $(ntverrc_def) $(ntverrc_inc_dirs)
 extra_rc_flags_os2 = -I"../res/ico_pm"
 
-$(proj_name).res : ../res/wbrw.rc $(ntverrc_exe_deps) $(ntmanif_deps) $(cli_wclass_rc_deps)
+$(proj_name).res : ../res/wbrw.rc $(ntverrc_exe_deps) $(cli_wclass_rc_deps)
     @%make echo_rc
     $(rc) $(ppflags_common) $(rc_cppflags) $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 

diff --git a/bld/ide/ide/master.mif b/bld/ide/ide/master.mif
@@ -8,6 +8,8 @@ sys_windowed = 1
 ide_autodepends = .AUTODEPEND
 !endif
 
+ide_ntmanif = ../res/win
+
 ide_wreslib_cli = gui
 ide_wreslib_incl = 1
 
@@ -89,18 +91,16 @@ exetarg_res           = $(proj_name).res
 #
 ntverrc_path = ../res/win
 !include ntverrc.mif
-ntmanif_path = ../res/win
-!include ntmanif.mif
 
 rc_inc_dirs = -I"../res/$(ide_rc_host_$(host_os))" -I"../res" $(cli_idelib_rc_inc_dirs)
 
 !ifdef sys_windowed
 extra_rc_flags = -DRESX_GUI
 !endif
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt = $(ntverrc_def) $(ntverrc_inc_dirs)
 
-$(proj_name).res : ../res/ide.rc $(ntmanif_deps) $(ntverrc_deps) $(cli_idelib_rc_deps)
+$(proj_name).res : ../res/ide.rc $(ntverrc_deps) $(cli_idelib_rc_deps)
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 

diff --git a/bld/sdk/ddespy/master.mif b/bld/sdk/ddespy/master.mif
@@ -6,6 +6,8 @@ proj_name = wddespy
 wddespy_autodepends = .AUTODEPEND
 !endif
 
+wddespy_ntmanif = ../res
+
 sys_windowed = 1
 
 additional_clean = *.gh *.grh *.grc
@@ -62,14 +64,12 @@ exetarg_res           = $(proj_name).res
 #
 ntverrc_path = ../res
 !include ntverrc.mif
-ntmanif_path = ../res
-!include ntmanif.mif
 
 rc_inc_dirs = $(cli_commonui_rc_inc_dirs) $(cli_wpi_inc_dirs)
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntverrc_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt = $(ntverrc_def) $(ntverrc_inc_dirs)
 
-$(proj_name).res : ../res/wddespy.rc $(ntverrc_exe_deps) $(ntmanif_deps) .AUTODEPEND $(__MAKEFILES__)
+$(proj_name).res : ../res/wddespy.rc $(ntverrc_exe_deps) .AUTODEPEND $(__MAKEFILES__)
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 

diff --git a/bld/sdk/drwat/master.mif b/bld/sdk/drwat/master.mif
@@ -2,12 +2,14 @@ tree_depth = 4
 
 proj_name = drwatcom
 
-sys_windowed = 1
-
 !ifndef drwatcom_autodepends
 drwatcom_autodepends = .AUTODEPEND
 !endif
 
+drwatcom_ntmanif = ../res/nt
+
+sys_windowed = 1
+
 additional_clean = *.gh *.grh *.grc
 
 !include cproj.mif
@@ -95,19 +97,17 @@ exetarg_res           = $(proj_name).res
 #
 ntverrc_path = ../res/nt
 !include ntverrc.mif
-ntmanif_path = ../res/nt
-!include ntmanif.mif
 
 rc_inc_dirs = -I"../res/$(host_os)" -I"../res" -I"../$(host_os)" -I"$(dig_dir)/h" $(cli_commonui_rc_inc_dirs)
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntverrc_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt = $(ntverrc_def) $(ntverrc_inc_dirs)
 
 !ifeq host_os win
 $(proj_name).res : ../res/$(host_os)/drwatcom.rc .AUTODEPEND
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(cppflags) $(rc_inc_path) $[@ -fo=$@
 !else
-$(proj_name).res : ../res/$(host_os)/drnt.rc $(ntverrc_exe_deps) $(ntmanif_deps) .AUTODEPEND
+$(proj_name).res : ../res/$(host_os)/drnt.rc $(ntverrc_exe_deps) .AUTODEPEND
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(cppflags) $(rc_inc_path) $[@ -fo=$@
 !endif

diff --git a/bld/sdk/imgedit/master.mif b/bld/sdk/imgedit/master.mif
@@ -6,6 +6,8 @@ proj_name = wimgedit
 wimgedit_autodepends = .AUTODEPEND
 !endif
 
+wimgedit_ntmanif = ../res
+
 wimgedit_wreslib_cli = gui
 wimgedit_wreslib_incl = 1
 
@@ -84,19 +86,17 @@ exetarg_res           = $(proj_name).res
 #
 ntverrc_path = ../res
 !include ntverrc.mif
-ntmanif_path = ../res
-!include ntmanif.mif
 
 rc_inc_dirs = -I"../res" $(cli_commonui_rc_inc_dirs) -Ih
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntverrc_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt = $(ntverrc_def) $(ntverrc_inc_dirs)
 
 !ifeq host_os os2
 $(proj_name).res : ../res/os2/wimgedit.rc rcstr.grh $(__MAKEFILES__)
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) -I"../res/os2" $(cppflags) $(rc_inc_path) $[@ -fo=$@
 !else
-$(proj_name).res : ../res/wimgedit.rc $(ntverrc_exe_deps) $(ntmanif_deps) rcstr.grh $(__MAKEFILES__)
+$(proj_name).res : ../res/wimgedit.rc $(ntverrc_exe_deps) rcstr.grh $(__MAKEFILES__)
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(cppflags) $(rc_inc_path) $[@ -fo=$@
 !endif

diff --git a/bld/sdk/spy/master.mif b/bld/sdk/spy/master.mif
@@ -2,16 +2,18 @@ tree_depth = 4
 
 proj_name = wspy
 
+!ifndef wspy_autodepends
+wspy_autodepends = .AUTODEPEND
+!endif
+
+wspy_ntmanif = ../res
+
 !ifeq host_os nt
 dllname = ntspyhk
 !else
 dllname = wspyhk
 !endif
 
-!ifndef wspy_autodepends
-wspy_autodepends = .AUTODEPEND
-!endif
-
 sys_windowed = 1
 
 additional_clean = *.gh *.grh *.grc
@@ -98,14 +100,12 @@ dlltarg_name          = $(dllname)
 #
 ntverrc_path = ../res
 !include ntverrc.mif
-ntmanif_path = ../res
-!include ntmanif.mif
 
 rc_inc_dirs = -I"../res" $(cli_commonui_rc_inc_dirs) $(cli_wpi_inc_dirs)
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntverrc_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt = $(ntverrc_def) $(ntverrc_inc_dirs)
 
-$(proj_name).res: ../res/wspy.rc $(ntverrc_exe_deps) $(ntmanif_deps) $(__MAKEFILES__) .AUTODEPEND
+$(proj_name).res: ../res/wspy.rc $(ntverrc_exe_deps) $(__MAKEFILES__) .AUTODEPEND
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 

diff --git a/bld/sdk/wde/master.mif b/bld/sdk/wde/master.mif
@@ -6,6 +6,8 @@ proj_name = wde
 wde_autodepends = .AUTODEPEND
 !endif
 
+wde_ntmanif = ../res
+
 wde_trmem = 1
 
 wde_wreslib_cli = gui
@@ -98,14 +100,12 @@ exetarg_res           = $(proj_name).res
 #
 ntverrc_path = ../res
 !include ntverrc.mif
-ntmanif_path = ../res
-!include ntmanif.mif
 
 rc_inc_dirs = -I"../res" -I"$(fmedit_dir)/dev" $(cli_commonui_rc_inc_dirs)
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntverrc_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt = $(ntverrc_def) $(ntverrc_inc_dirs)
 
-$(proj_name).res: ../res/wde.rc $(ntverrc_exe_deps) $(ntmanif_deps) $(__MAKEFILES__) .AUTODEPEND
+$(proj_name).res: ../res/wde.rc $(ntverrc_exe_deps) $(__MAKEFILES__) .AUTODEPEND
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(cppflags) $(rc_inc_path) $[@ -fo=$@
 

diff --git a/bld/sdk/wre/master.mif b/bld/sdk/wre/master.mif
@@ -6,6 +6,8 @@ proj_name = wre
 wre_autodepends = .AUTODEPEND
 !endif
 
+wre_ntmanif = ../res
+
 wre_trmem = 1
 
 wre_wreslib_cli = gui
@@ -89,14 +91,12 @@ exetarg_res           = $(proj_name).res
 # rc and others
 ntverrc_path = ../res
 !include ntverrc.mif
-ntmanif_path = ../res
-!include ntmanif.mif
 
 rc_inc_dirs = -I"../res" $(cli_commonui_rc_inc_dirs)
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntverrc_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt = $(ntverrc_def) $(ntverrc_inc_dirs)
 
-$(proj_name).res : ../res/wre.rc $(ntverrc_exe_deps) $(ntmanif_deps) $(__MAKEFILES__) .AUTODEPEND
+$(proj_name).res : ../res/wre.rc $(ntverrc_exe_deps) $(__MAKEFILES__) .AUTODEPEND
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 

diff --git a/bld/sdk/zoom/master.mif b/bld/sdk/zoom/master.mif
@@ -6,6 +6,8 @@ proj_name = wzoom
 wzoom_autodepends = .AUTODEPEND
 !endif
 
+wzoom_ntmanif = ../res
+
 sys_windowed = 1
 
 additional_clean = *.gh *.grh *.grc
@@ -62,18 +64,16 @@ exetarg_res           = $(proj_name)j.res
 #
 ntverrc_path = ../res
 !include ntverrc.mif
-ntmanif_path = ../res
-!include ntmanif.mif
 
 rc_inc_dirs = -I"../res" $(cli_commonui_rc_inc_dirs)
 
-extra_rc_flags_nt = $(ntmanif_def) $(ntverrc_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt = $(ntverrc_def) $(ntverrc_inc_dirs)
 
-$(proj_name).res : ../res/wzoom.rc $(ntverrc_exe_deps) $(ntmanif_deps) $(__MAKEFILES__) .AUTODEPEND
+$(proj_name).res : ../res/wzoom.rc $(ntverrc_exe_deps) $(__MAKEFILES__) .AUTODEPEND
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -ad $(rc_flags) $(rc_inc_path) $[@ -fo=$@
 
-$(proj_name)j.res : ../res/wzoom.rc $(ntverrc_exe_deps) $(ntmanif_deps) $(__MAKEFILES__) .AUTODEPEND
+$(proj_name)j.res : ../res/wzoom.rc $(ntverrc_exe_deps) $(__MAKEFILES__) .AUTODEPEND
     @%make echo_rc
     $(rcu8j) $(ppflags_common) $(rc_cppflags) -DJAPANESE -ad $(rc_flags) -I"../res/kanji" $(rc_inc_path) $[@ -fo=$@
 

diff --git a/bld/setupgui/master.mif b/bld/setupgui/master.mif
@@ -2,6 +2,8 @@ proj_name = setupgui
 
 setupgui_autodepends = .AUTODEPEND
 
+setupgui_ntmanif = ../res/nt
+
 setupgui_nofpu = 1
 
 setupgui_nodoslfn = 1
@@ -150,22 +152,20 @@ exetarg_name          = jf77setup
 !ifdef sys_windowed
 depend_res_os2 = ../res/os2/setup.ico
 !endif
-depend_res_nt  = $(ntverrc_exe_deps) $(ntmanif_deps) ../res/nt/setup.ico ../res/nt/disk.ico
+depend_res_nt  = $(ntverrc_exe_deps) ../res/nt/setup.ico ../res/nt/disk.ico
 depend_res_win = ../res/win/setup.ico ../res/win/disk.ico
 depend_res = ../h/setup.h $(depend_res_$(host_os))
 
 ntverrc_path = ../res/nt
 !include ntverrc.mif
-ntmanif_path = ../res/nt
-!include ntmanif.mif
 
 rc_inc_dirs = -I"../res/$(host_os)" -I"../res" $(cli_gui_rc_inc_dirs)
 
 !ifdef sys_windowed
 extra_rc_flags = -DRESX_GUI
 !endif
 extra_rc_flags_win = -30
-extra_rc_flags_nt  = $(ntmanif_def) $(ntverrc_def) $(ntmanif_inc_dirs) $(ntverrc_inc_dirs)
+extra_rc_flags_nt  = $(ntverrc_def) $(ntverrc_inc_dirs)
 
 # UI resources
 setup.res : ../res/setup.rc $(depend_res) $(cli_gui_rc_deps) $(__MAKEFILES__)