diff --git a/build.bat b/build.bat index 3bd9964..9782b11 100644 --- a/build.bat +++ b/build.bat @@ -5,7 +5,7 @@ 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\ -set includes=d:\yad\svn\pentevo\rom;d:\zxgit\common_includes\ +call setpath_includes cls diff --git a/docs/history.txt b/docs/history.txt index dc0ffdb..f1ffa47 100644 --- a/docs/history.txt +++ b/docs/history.txt @@ -5,6 +5,8 @@ FE - FileEditor 31.05.25 FN +- небольшие переделки в bat файлах +- исправлен "attribut" на "attribute" - исправлен в 2х местах "claster" на "cluster" 28.05.25 diff --git a/fn/flx/fnviewer.flx b/fn/flx/fnviewer.flx index 771afc2..b998093 100644 Binary files a/fn/flx/fnviewer.flx and b/fn/flx/fnviewer.flx differ diff --git a/fn/fn.exe b/fn/fn.exe index fe09c10..77eb0a5 100644 Binary files a/fn/fn.exe and b/fn/fn.exe differ diff --git a/plugins/calc/build.bat b/plugins/calc/build.bat index 3148357..889b59e 100644 --- a/plugins/calc/build.bat +++ b/plugins/calc/build.bat @@ -3,7 +3,8 @@ 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:\zxgit\common_includes\;d:\zxgit\flex_nav\ +call ..\..\setpath_includes +set includes=%includes%;..\..\ 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 d54f713..512d2e8 100644 --- a/plugins/cdplayer/build.bat +++ b/plugins/cdplayer/build.bat @@ -3,7 +3,8 @@ 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:\zxgit\common_includes\;d:\zxgit\flex_nav\ +call ..\..\setpath_includes +set includes=%includes%;..\..\ 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 cf05ee3..0c0be4d 100644 --- a/plugins/date/build.bat +++ b/plugins/date/build.bat @@ -3,7 +3,8 @@ 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:\zxgit\common_includes\;d:\zxgit\flex_nav\ +call ..\..\setpath_includes +set includes=%includes%;..\..\ 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 cabd66d..8d12807 100644 --- a/plugins/fneditor/build.bat +++ b/plugins/fneditor/build.bat @@ -3,7 +3,8 @@ 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:\zxgit\common_includes\;d:\zxgit\flex_nav\ +call ..\..\setpath_includes +set includes=%includes%;..\..\ 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 de243aa..82de503 100644 --- a/plugins/fnviewer/build.bat +++ b/plugins/fnviewer/build.bat @@ -3,7 +3,8 @@ if not exist tmp md tmp 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\ +call ..\..\setpath_includes +set includes=%includes%;..\..\ 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/fviewer.a80 b/plugins/fnviewer/fviewer.a80 index c52e941..bd94ed7 100644 --- a/plugins/fnviewer/fviewer.a80 +++ b/plugins/fnviewer/fviewer.a80 @@ -496,7 +496,7 @@ FVFTime EQU $ - STRLEN(" ") - 1 W_TEXT 348,231,COLORP.HIGHGRAY,"First cluster: " FVFClast EQU $ - STRLEN(" ") - 1 W_VERTICLINE 480,230,10 - W_TEXT 492,231,COLORP.HIGHGRAY,"File attribut: " + W_TEXT 492,231,COLORP.HIGHGRAY,"File attribute: " FVFAttrib EQU $ - STRLEN(" ") - 1 W_END SPDSS DSSF.CURDISK diff --git a/plugins/help/build.bat b/plugins/help/build.bat index cb5add4..1b37ede 100644 --- a/plugins/help/build.bat +++ b/plugins/help/build.bat @@ -3,7 +3,8 @@ 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:\zxgit\common_includes\;d:\zxgit\flex_nav\ +call ..\..\setpath_includes +set includes=%includes%;..\..\ 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 ae67e48..6e66986 100644 --- a/plugins/test/build.bat +++ b/plugins/test/build.bat @@ -3,7 +3,8 @@ 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:\zxgit\common_includes\;d:\zxgit\flex_nav\ +call ..\..\setpath_includes +set includes=%includes%;..\..\ asl -U -L -C -x -olist tmp\test.lst -i %includes% test.a80 || goto error p2bin test.p ..\test.flx -r $-$ -k