diff --git a/build.bat b/build.bat index d5314db..3bd9964 100644 --- a/build.bat +++ b/build.bat @@ -4,8 +4,8 @@ if not exist tmp md tmp if not exist fn md fn if not exist fn\flx md fn\flx -set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\;d:\yad\svn\pentevo\tools\noice2equ\;d:\yad\sprinter_src\tools\ -set includes=d:\yad\svn\pentevo\rom;d:\yad\sprinter_src\ +set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\;d:\yad\svn\pentevo\tools\noice2equ\ +set includes=d:\yad\svn\pentevo\rom;d:\zxgit\common_includes\ cls @@ -14,7 +14,6 @@ rem Flex Navigator mhmt font.raw tmp\font_raw.pack mhmt iff_font.raw tmp\iff_font_raw.pack -rem asl -U -L -C -x -olist tmp\fnexeboot.lst -i %includes% fn_exe_boot.a80 || goto error asl -U -L -C -x -olist tmp\fnexeboot.lst -i %includes% -D NO_EDIT,NO_VIEW,NO_HELP fn_exe_boot.a80 || goto error p2bin fn_exe_boot.p tmp\fn.exe -r $-$ -k diff --git a/fn/flx/calc.flx b/fn/flx/calc.flx new file mode 100644 index 0000000..01b0a97 Binary files /dev/null and b/fn/flx/calc.flx differ diff --git a/fn/flx/cdplayer.flx b/fn/flx/cdplayer.flx new file mode 100644 index 0000000..1357ff9 Binary files /dev/null and b/fn/flx/cdplayer.flx differ diff --git a/fn/flx/date.flx b/fn/flx/date.flx new file mode 100644 index 0000000..5bf18d5 Binary files /dev/null and b/fn/flx/date.flx differ diff --git a/fn/flx/fneditor.flx b/fn/flx/fneditor.flx new file mode 100644 index 0000000..31f54d0 Binary files /dev/null and b/fn/flx/fneditor.flx differ diff --git a/fn/flx/fnviewer.flx b/fn/flx/fnviewer.flx new file mode 100644 index 0000000..e4d446d Binary files /dev/null and b/fn/flx/fnviewer.flx differ diff --git a/fn/flx/help.flx b/fn/flx/help.flx new file mode 100644 index 0000000..4083102 Binary files /dev/null and b/fn/flx/help.flx differ diff --git a/fn/flx/test.flx b/fn/flx/test.flx new file mode 100644 index 0000000..f64aae5 Binary files /dev/null and b/fn/flx/test.flx differ diff --git a/fn/fn.exe b/fn/fn.exe new file mode 100644 index 0000000..94d85c1 Binary files /dev/null and b/fn/fn.exe differ diff --git a/fn_exe_boot.a80 b/fn_exe_boot.a80 index c3724cc..088acd8 100644 --- a/fn_exe_boot.a80 +++ b/fn_exe_boot.a80 @@ -1,5 +1,5 @@ -; LAST UPDATE: 29.05.2025 savelij +; LAST UPDATE: 30.05.2025 savelij include macros.a80 @@ -11,7 +11,7 @@ include ports_sp.a80 include mouse_sp.a80 include accel_sp.a80 - include fatdir.a80 + include fat_dir_sp.a80 include fn_version.a80 INIT_VAR 0xC000 diff --git a/plugins/build_pause.bat b/plugins/build_pause.bat new file mode 100644 index 0000000..4823e17 --- /dev/null +++ b/plugins/build_pause.bat @@ -0,0 +1,6 @@ + +@echo off + +call build_all.bat + +pause diff --git a/plugins/calc/build.bat b/plugins/calc/build.bat index 635d559..3148357 100644 --- a/plugins/calc/build.bat +++ b/plugins/calc/build.bat @@ -3,7 +3,7 @@ if not exist tmp md tmp set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\;d:\yad\sprinter_src\tools\ -set includes=d:\yad\svn\pentevo\rom;d:\yad\sprinter_src\;d:\yad\sprinter_src\flexnav\src\ +set includes=d:\yad\svn\pentevo\rom;d:\zxgit\common_includes\;d:\zxgit\flex_nav\ asl -U -L -C -x -olist tmp\calc.lst -i %includes% calc.a80 || goto error p2bin calc.p ..\calc.flx -r $-$ -k diff --git a/plugins/cdplayer/build.bat b/plugins/cdplayer/build.bat index 7a25202..d54f713 100644 --- a/plugins/cdplayer/build.bat +++ b/plugins/cdplayer/build.bat @@ -3,7 +3,7 @@ if not exist tmp md tmp set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\;d:\yad\sprinter_src\tools\ -set includes=d:\yad\svn\pentevo\rom;d:\yad\sprinter_src\;d:\yad\sprinter_src\flexnav\src\ +set includes=d:\yad\svn\pentevo\rom;d:\zxgit\common_includes\;d:\zxgit\flex_nav\ asl -U -L -C -x -olist tmp\flx-date.lst -i %includes% cdplayer.a80 || goto error p2bin cdplayer.p ..\cdplayer.flx -r $-$ -k diff --git a/plugins/date/build.bat b/plugins/date/build.bat index fefb75f..cf05ee3 100644 --- a/plugins/date/build.bat +++ b/plugins/date/build.bat @@ -3,7 +3,7 @@ if not exist tmp md tmp set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\;d:\yad\sprinter_src\tools\ -set includes=d:\yad\svn\pentevo\rom;d:\yad\sprinter_src\;d:\yad\sprinter_src\flexnav\src\ +set includes=d:\yad\svn\pentevo\rom;d:\zxgit\common_includes\;d:\zxgit\flex_nav\ asl -U -L -C -x -olist tmp\date.lst -i %includes% date.a80 || goto error p2bin date.p ..\date.flx -r $-$ -k diff --git a/plugins/fneditor/build.bat b/plugins/fneditor/build.bat index ceee35c..cabd66d 100644 --- a/plugins/fneditor/build.bat +++ b/plugins/fneditor/build.bat @@ -3,7 +3,7 @@ if not exist tmp md tmp set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\;d:\yad\sprinter_src\tools\ -set includes=d:\yad\svn\pentevo\rom;d:\yad\sprinter_src\;d:\yad\sprinter_src\flexnav\src\ +set includes=d:\yad\svn\pentevo\rom;d:\zxgit\common_includes\;d:\zxgit\flex_nav\ asl -U -L -C -x -olist tmp\fneditor.lst -i %includes% femain.a80 || goto error p2bin femain.p ..\fneditor.flx -r $-$ -k diff --git a/plugins/fnviewer/build.bat b/plugins/fnviewer/build.bat index 2e8035e..de243aa 100644 --- a/plugins/fnviewer/build.bat +++ b/plugins/fnviewer/build.bat @@ -2,8 +2,8 @@ @echo off if not exist tmp md tmp -set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\;d:\yad\sprinter_src\tools\ -set includes=d:\yad\svn\pentevo\rom;d:\yad\sprinter_src\;d:\yad\sprinter_src\flexnav\src\ +set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\ +set includes=d:\yad\svn\pentevo\rom;d:\zxgit\common_includes\;d:\zxgit\flex_nav\ asl -U -L -C -x -olist tmp\fviewer.lst -i %includes% fvmain.a80 || goto error p2bin fvmain.p ..\fnviewer.flx -r $-$ -k diff --git a/plugins/fnviewer/fvmain.a80 b/plugins/fnviewer/fvmain.a80 index 5a6f260..1784503 100644 --- a/plugins/fnviewer/fvmain.a80 +++ b/plugins/fnviewer/fvmain.a80 @@ -1,17 +1,19 @@ -; LAST UPDATE: 20.03.2025 savelij +; LAST UPDATE: 30.05.2025 savelij include macros.a80 + include fn_const.a80 include fn_macros.a80 include fn_version.a80 include accel_sp.a80 include ports_sp.a80 include define_sp.a80 - include macros_sp.a80 include dss_sp.a80 include bios_sp.a80 include mouse_sp.a80 + include fat_dir_sp.a80 + include macros_sp.a80 org PluginOrg ; #C000 - Header lenght ; Flex Navigator plugin header diff --git a/plugins/help/build.bat b/plugins/help/build.bat index 7d0c35c..cb5add4 100644 --- a/plugins/help/build.bat +++ b/plugins/help/build.bat @@ -3,7 +3,7 @@ if not exist tmp md tmp set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\;d:\yad\sprinter_src\tools\ -set includes=d:\yad\svn\pentevo\rom;d:\yad\sprinter_src\;d:\yad\sprinter_src\flexnav\src\ +set includes=d:\yad\svn\pentevo\rom;d:\zxgit\common_includes\;d:\zxgit\flex_nav\ asl -U -L -C -x -olist tmp\header.lst -i %includes% header.a80 || goto error p2bin header.p ..\help.flx -r $-$ -k diff --git a/plugins/test/build.bat b/plugins/test/build.bat index e6e9708..ae67e48 100644 --- a/plugins/test/build.bat +++ b/plugins/test/build.bat @@ -3,7 +3,7 @@ if not exist tmp md tmp set path=d:\yad\svn\pentevo\tools\asl\bin\;d:\yad\svn\pentevo\tools\mhmt\;d:\yad\sprinter_src\tools\ -set includes=d:\yad\svn\pentevo\rom;d:\yad\sprinter_src\;d:\yad\sprinter_src\flexnav\src\ +set includes=d:\yad\svn\pentevo\rom;d:\zxgit\common_includes\;d:\zxgit\flex_nav\ asl -U -L -C -x -olist tmp\test.lst -i %includes% test.a80 || goto error p2bin test.p ..\test.flx -r $-$ -k