From 3e035c29a7c86e901b8b42fd053c0cfa17b40ba9 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 8 Jun 2021 09:42:04 +0000 Subject: [PATCH] some fixes git-svn-id: svn://kolibrios.org@8781 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 17 ++++---- data/common/File Managers/icons.ini | 2 + ...s and znes must be in the same folder!.txt | 2 + data/common/emul/{ => zsnes}/zsnes | Bin data/common/settings/assoc.ini | 2 +- data/eng/settings/menu.dat | 6 +-- data/et/settings/menu.dat | 2 +- data/it/settings/menu.dat | 6 +-- data/rus/settings/menu.dat | 2 +- data/sp/settings/menu.dat | 2 +- .../develop/ktcc/trunk/samples/build_all.sh | 40 +++++++++--------- 11 files changed, 44 insertions(+), 37 deletions(-) create mode 100644 data/common/emul/zsnes/roms and znes must be in the same folder!.txt rename data/common/emul/{ => zsnes}/zsnes (100%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index a70b1f9802..1926650e49 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -27,8 +27,8 @@ img_files = { {"NOTIFY3.PNG", "common/notify3.png"}, {"UNIMG", PROGS .. "/fs/unimg/unimg"}, {"3D/HOUSE.3DS", "common/3d/house.3ds"}, - {"File Managers/ICONS.INI", "common/File Managers/icons.ini"}, {"File Managers/EFM", "common/File Managers/efm"}, + {"File Managers/ICONS.INI", "common/File Managers/icons.ini"}, {"File Managers/KFM.INI", "common/File Managers/kfm.ini"}, {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/About.txt"}, {"File Managers/FNAV/FNAV", "common/File Managers/fNav/fNav.kex"}, @@ -205,6 +205,7 @@ extra_files = { {"kolibrios/emul/kwine/kwine", PROGS .. "/emulator/kwine/bin/kwine"}, {"kolibrios/emul/kwine/lib/", PROGS .. "/emulator/kwine/bin/lib/*"}, {"kolibrios/emul/uarm/", "common/emul/uarm/*"}, + {"kolibrios/emul/zsnes/", "common/emul/zsnes/*"}, {"kolibrios/demos/ak47.lif", "common/demos/ak47.lif"}, {"kolibrios/demos/life2", "common/demos/life2"}, {"kolibrios/demos/relay.lif", "common/demos/relay.lif"}, @@ -290,13 +291,13 @@ extra_files = { {"kolibrios/utils/vmode", "common/vmode"}, {"kolibrios/utils/texture", "common/utils/texture"}, {"kolibrios/utils/t_edit.ini", PROGS .. "/other/t_edit/t_edit.ini"}, - {"kolibrios/utils/INFO/ASM.SYN", PROGS .. "/other/t_edit/info/asm.syn"}, - {"kolibrios/utils/INFO/CPP_CLA.SYN", PROGS .. "/other/t_edit/info/cpp_kol_cla.syn"}, - {"kolibrios/utils/INFO/CPP_DAR.SYN", PROGS .. "/other/t_edit/info/cpp_kol_dar.syn"}, - {"kolibrios/utils/INFO/CPP_DEF.SYN", PROGS .. "/other/t_edit/info/cpp_kol_def.syn"}, - {"kolibrios/utils/INFO/DEFAULT.SYN", PROGS .. "/other/t_edit/info/default.syn"}, - {"kolibrios/utils/INFO/HTML.SYN", PROGS .. "/other/t_edit/info/html.syn"}, - {"kolibrios/utils/INFO/INI.SYN", PROGS .. "/other/t_edit/info/ini_files.syn"}, + {"kolibrios/utils/info/ASM.SYN", PROGS .. "/other/t_edit/info/asm.syn"}, + {"kolibrios/utils/info/CPP_CLA.SYN", PROGS .. "/other/t_edit/info/cpp_kol_cla.syn"}, + {"kolibrios/utils/info/CPP_DAR.SYN", PROGS .. "/other/t_edit/info/cpp_kol_dar.syn"}, + {"kolibrios/utils/info/CPP_DEF.SYN", PROGS .. "/other/t_edit/info/cpp_kol_def.syn"}, + {"kolibrios/utils/info/DEFAULT.SYN", PROGS .. "/other/t_edit/info/default.syn"}, + {"kolibrios/utils/info/HTML.SYN", PROGS .. "/other/t_edit/info/html.syn"}, + {"kolibrios/utils/info/INI.SYN", PROGS .. "/other/t_edit/info/ini_files.syn"}, } if build_type == "rus" then tup.append_table(extra_files, { {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"}, diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index e78985c166..3a2afa7588 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -160,7 +160,9 @@ csv=21 xls=21 xlsx=21 nes=23 +snes=23 sna=23 +min=23 bat=24 sh=24 sys=25 diff --git a/data/common/emul/zsnes/roms and znes must be in the same folder!.txt b/data/common/emul/zsnes/roms and znes must be in the same folder!.txt new file mode 100644 index 0000000000..757e4a6a27 --- /dev/null +++ b/data/common/emul/zsnes/roms and znes must be in the same folder!.txt @@ -0,0 +1,2 @@ +You may just copy zsnes into folder with ROMs and run it. +zsnes could not open files as params. \ No newline at end of file diff --git a/data/common/emul/zsnes b/data/common/emul/zsnes/zsnes similarity index 100% rename from data/common/emul/zsnes rename to data/common/emul/zsnes/zsnes diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index 5b7c82e8c5..a7e3ca214f 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -187,7 +187,7 @@ lif=/kolibrios/demos/life2 kla=/sys/games/klavisha pdf=/kolibrios/media/updf -smc=/kolibrios/emul/zsnes +smc=/kolibrios/emul/zsnes/zsnes mcr=/kolibrios/emul/psx4all nes=/kolibrios/emul/fceu/fceu sna=/kolibrios/emul/e80/e80 diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 60a09483f8..cc750a52e0 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -56,12 +56,12 @@ Character table |develop/ASCIIVju Key ASCII-codes |develop/keyascii Key SCAN-codes |develop/scancode #6 **** EMUL -DOSBox* (DOS PC) |/kolibrios/emul/DosBox/dosbox +DOSBox* |/kolibrios/emul/DosBox/dosbox e80* (ZX Spectrum) |/kolibrios/emul/e80/e80 FCE Ultra* (NES) |/kolibrios/emul/fceu/fceu Gameboy Color* |/kolibrios/emul/gameboy -ScummVM* (adventure) |/kolibrios/emul/scummvm -ZSNES* (super Nintendo) //kolibrios/emul/zsnes +ScummVM* |/kolibrios/emul/scummvm +ZSNES* Super Nintendo |/kolibrios/emul/zsnes/zsnes #7 **** SYSTEM File Management > |@8 Accessibility > |@9 diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 346a78bb12..1ad73c6b9e 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -136,5 +136,5 @@ e80 (ZX Spectrum) |/kolibrios/emul/e80/e80 FCE Ultra - NES |/kolibrios/emul/fceu/fceu Gameboy Color |/kolibrios/emul/gameboy ScummVM (adventure) |/kolibrios/emul/scummvm -ZSNES Super Nintendo |/kolibrios/emul/zsnes +ZSNES Super Nintendo |/kolibrios/emul/zsnes/zsnes ## diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index f505f1d521..ae71842c16 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -132,10 +132,10 @@ FSPEED speed of FS |fspeed Lente di ingrandimento|magnify Tastiera da schermo |zkey #18 **** EMUL -DOSBox DOS Emulator |/kolibrios/emul/DosBox/dosbox +DOSBox |/kolibrios/emul/DosBox/dosbox e80 (ZX Spectrum) |/kolibrios/emul/e80/e80 FCE Ultra - NES |/kolibrios/emul/fceu/fceu Gameboy Color |/kolibrios/emul/gameboy -ScummVM (adventure) |/kolibrios/emul/scummvm -ZSNES Super Nintendo |/kolibrios/emul/zsnes +ScummVM |/kolibrios/emul/scummvm +ZSNES Super Nintendo |/kolibrios/emul/zsnes/zsnes ## diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index ba5e781688..4509cc923c 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -61,7 +61,7 @@ SCAN- DOSBox |/kolibrios/emul/DosBox/dosbox e80 (ZX Spectrum) |/kolibrios/emul/e80/e80 FCE Ultra - NES |/kolibrios/emul/fceu/fceu -ZSNES Super Nintendo |/kolibrios/emul/zsnes +ZSNES Super Nintendo |/kolibrios/emul/zsnes/zsnes ScummVM |/kolibrios/emul/scummvm #7 ==Система Файловые менеджеры > |@8 diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index 7f2254855d..0ddd450f6d 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -135,6 +135,6 @@ Teclado en pantalla |zkey DOSBox |/kolibrios/emul/DosBox/dosbox e80 (ZX Spectrum) |/kolibrios/emul/e80/e80 FCE Ultra - NES |/kolibrios/emul/fceu/fceu -ZSNES Super Nintendo |/kolibrios/emul/zsnes +ZSNES Super Nintendo |/kolibrios/emul/zsnes/zsnes ScummVM (adventure) |/kolibrios/emul/scummvm ## diff --git a/programs/develop/ktcc/trunk/samples/build_all.sh b/programs/develop/ktcc/trunk/samples/build_all.sh index 39bcc775a0..baf5c3c644 100644 --- a/programs/develop/ktcc/trunk/samples/build_all.sh +++ b/programs/develop/ktcc/trunk/samples/build_all.sh @@ -1,21 +1,23 @@ #SHS -../tcc asm_ex.c -lck -o /tmp0/1/asm_ex -../tcc consoleio.c -lck -o /tmp0/1/consoleio -../tcc files.c -lck -o /tmp0/1/files -../tcc winbasics.c -lck -o /tmp0/1/winbasics -../tcc dynamic.c -lck -lhttp -linputbox -o /tmp0/1/dynamic -../tcc load_coff.c -o /tmp0/1/load_coff -lck -../tcc clayer/msgbox.c -lck -lmsgbox -o /tmp0/1/msgbox -../tcc graphics.c -lck -lgb -o /tmp0/1/graphics -../tcc clayer/rasterworks.c -lck -lrasterworks -o /tmp0/1/rasterworks -../tcc clayer/boxlib.c -lck -lbox -o /tmp0/1/boxlib_ex -../tcc clayer/libimg.c -lck -limg -o /tmp0/1/libimg_ex -cp clayer/logo.png /tmp0/1/logo.png -../tcc clayer/dialog.c -lck -ldialog -o /tmp0/1/dialog_ex -../tcc dir_example.c -lck -o /tmp0/1/dir_example -../tcc net/tcpsrv_demo.c -lck -o /tmp0/1/tcpsrv_demo -../tcc net/nslookup.c -lck -lnetwork -o /tmp0/1/nslookup -../tcc net/http_tcp_demo.c -lck -lnetwork -o /tmp0/1/http_tcp_demo -../tcc getopt_ex.c -lck -o /tmp0/1/getopt_ex -../tcc tinygl/fps.c tinygl/gears.c -o /tmp0/1/gears -ltinygl -lck +/sys/@notify 'Build in progress...\nYou will find binaries in /tmp0/1/tccbin' -I +mkdir /tmp0/1/tccbin +../tcc asm_ex.c -lck -o /tmp0/1/tccbin/asm_ex +../tcc consoleio.c -lck -o /tmp0/1/tccbin/consoleio +../tcc files.c -lck -o /tmp0/1/tccbin/files +../tcc winbasics.c -lck -o /tmp0/1/tccbin/winbasics +../tcc dynamic.c -lck -lhttp -linputbox -o /tmp0/1/tccbin/dynamic +../tcc load_coff.c -o /tmp0/1/tccbin/load_coff -lck +../tcc clayer/msgbox.c -lck -lmsgbox -o /tmp0/1/tccbin/msgbox +../tcc graphics.c -lck -lgb -o /tmp0/1/tccbin/graphics +../tcc clayer/rasterworks.c -lck -lrasterworks -o /tmp0/1/tccbin/rasterworks +../tcc clayer/boxlib.c -lck -lbox -o /tmp0/1/tccbin/boxlib_ex +../tcc clayer/libimg.c -lck -limg -o /tmp0/1/tccbin/libimg_ex +cp clayer/logo.png /tmp0/1/tccbin/logo.png +../tcc clayer/dialog.c -lck -ldialog -o /tmp0/1/tccbin/dialog_ex +../tcc dir_example.c -lck -o /tmp0/1/tccbin/dir_example +../tcc net/tcpsrv_demo.c -lck -o /tmp0/1/tccbin/tcpsrv_demo +../tcc net/nslookup.c -lck -lnetwork -o /tmp0/1/tccbin/nslookup +../tcc net/http_tcp_demo.c -lck -lnetwork -o /tmp0/1/tccbin/http_tcp_demo +../tcc getopt_ex.c -lck -o /tmp0/1/tccbin/getopt_ex +../tcc tinygl/fps.c tinygl/gears.c -o /tmp0/1/tccbin/gears -ltinygl -lck exit