From 6a851c29a833b5c4a9962dd4866cbfda5872cb30 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 21 Nov 2016 20:51:18 +0000 Subject: [PATCH] menu.dat: remove cubeline, replace /KolibriOS/ by /kolibrios/ as it is case sensitive now, 3D/Gears: replace C version by ASM version git-svn-id: svn://kolibrios.org@6736 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 5 ++--- data/common/settings/app_plus.ini | 6 ++++-- data/eng/settings/menu.dat | 21 ++++++++++----------- data/et/settings/menu.dat | 17 ++++++++--------- data/it/settings/menu.dat | 1 - data/rus/settings/menu.dat | 17 ++++++++--------- data/sp/settings/menu.dat | 17 ++++++++--------- 7 files changed, 40 insertions(+), 44 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index cadbdaa35b..493f4f0a34 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -157,7 +157,6 @@ extra_files = { {"kolibrios/3D/voxel_utilites/TOOLBAR_T.PNG" , PROGS .. "/media/voxel_editor/utilites/toolbar_t.png"}, {"kolibrios/3D/FONT8X9.BMP", PROGS .. "/fs/kfar/trunk/font8x9.bmp"}, {"kolibrios/3D/TOOLB_1.PNG", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/toolb_1.png"}, - {"kolibrios/3D/GEARS", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/gears"}, {"kolibrios/3D/TEST_GLU1", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/test_glu1"}, {"kolibrios/3D/TEST_GLU2", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/test_glu2"}, {"kolibrios/3D/TEXT_2.PNG", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/text_2.png"}, @@ -359,6 +358,7 @@ tup.append_table(img_files, { {"3D/3DWAV", PROGS .. "/demos/3dwav/trunk/3dwav"}, {"3D/CROWNSCR", PROGS .. "/demos/crownscr/trunk/crownscr"}, {"3D/FREE3D04", PROGS .. "/demos/free3d04/trunk/free3d04"}, + {"3D/GEARS", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/gears"}, {"3D/RAY", PROGS .. "/demos/ray/ray"}, {"3D/VIEW3DS", PROGS .. "/demos/3DS/VIEW3DS"}, {"DEMOS/BCDCLK", PROGS .. "/demos/bcdclk/trunk/bcdclk"}, @@ -573,13 +573,12 @@ end -- tup.getconfig('NO_MSVC') ~= 'full' -- Programs that require GCC to compile. if tup.getconfig('NO_GCC') ~= 'full' then tup.append_table(img_files, { - {"3D/GEARS", PROGS .. "/demos/gears/trunk/gears"}, {"GAMES/CHECKERS", PROGS .. "/games/checkers/trunk/checkers"}, {"GAMES/REVERSI", PROGS .. "/games/reversi/trunk/reversi"}, {"SHELL", PROGS .. "/system/shell/shell"}, }) tup.append_table(extra_files, { - {"kolibrios/demos/cubeline", PROGS .. "/demos/cubeline/trunk/cubeline"}, + {"kolibrios/3D/cubeline", PROGS .. "/demos/cubeline/trunk/cubeline"}, {"kolibrios/emul/e80/e80", PROGS .. "/emulator/e80/trunk/e80"}, {"kolibrios/games/2048/", PROGS .. "/games/2048/2048"}, {"kolibrios/games/donkey", PROGS .. "/games/donkey/donkey"}, diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini index 58b565053f..d0af07456c 100644 --- a/data/common/settings/app_plus.ini +++ b/data/common/settings/app_plus.ini @@ -15,8 +15,10 @@ Info3DsUser=/kolibrios/3d/info3ds/info3ds_u,75 VoxelEditor=/kolibrios/3d/voxel_editor/voxel_editor,30 [3D Demos] -3dsHeart=/kolibrios/3d/3dsheart,78 -M2View=/kolibrios/3d/md2view/md2view,78 +3dsHeart=/kolibrios/3D/3dsheart,78 +Cubeline=/kolibrios/3D/cubeline,78 +M2View=/kolibrios/3D/md2view/md2view,78 +Globe=/kolibrios/3D/TEXTURES1,78 [Other] Calc+=/kolibrios/utils/calcplus,4 diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 49b185fb4c..1ee5ebd56e 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -21,7 +21,7 @@ Eyes /sys/demos/eyes Tube /sys/demos/tube Plasma /sys/demos/plasma Moveback /sys/demos/movback -Life* /KolibriOS/demos/life2 +Life* /kolibrios/demos/life2 TranTest /sys/demos/trantest WEB /sys/demos/web FireWork /sys/demos/firework @@ -29,20 +29,19 @@ UnvWater /sys/demos/unvwater #2 **** 3D demos **** ScreenSaver /sys/3d/crownscr 3D-labyrinth /sys/3d/free3d04 -Heart* /KolibriOS/3d/3dsheart +Heart* /kolibrios/3d/3dsheart View3DS /sys/3d/view3ds -CubeLine /sys/3d/cubeline Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav #3 **** GRAPHICS **** Kolibri Image Viewer /sys/media/kiv -zSea* (image viewer) /KolibriOS/media/zsea/zsea +zSea* (image viewer) /kolibrios/media/zsea/zsea Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** Pixie (MP3 player) /sys/media/pixie/pixie -Fplay* (video player) /KolibriOS/media/fplay-full +Fplay* (video player) /kolibrios/media/fplay-full MidAMP /sys/media/midamp #5 **** PROGRAMMING **** Examples > /@6 @@ -129,10 +128,10 @@ Screen magnifier /sys/magnify Screen keyboard /sys/zkey Character table /sys/ASCIIVju #18 **** EMULATORS **** -DOSBox* (DOS PC) /KolibriOS/emul/DosBox/dosbox -e80* (ZX Spectrum) /KolibriOS/emul/e80/e80 -FCE Ultra* (NES) /KolibriOS/emul/fceu/fce -Gameboy Color* /KolibriOS/emul/gameboy -ScummVM* (adventure) /KolibriOS/emul/scummvm -ZSNES* (super Nintendo) /KolibriOS/emul/zsnes +DOSBox* (DOS PC) /kolibrios/emul/DosBox/dosbox +e80* (ZX Spectrum) /kolibrios/emul/e80/e80 +FCE Ultra* (NES) /kolibrios/emul/fceu/fce +Gameboy Color* /kolibrios/emul/gameboy +ScummVM* (adventure) /kolibrios/emul/scummvm +ZSNES* (super Nintendo) /kolibrios/emul/zsnes ## diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 259b2e5e44..588b319ed7 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -31,18 +31,17 @@ ScreenSaver /sys/3d/crownscr 3D-labyrinth /sys/3d/free3d04 Heart /sys/3d/3dsheart View3DS /sys/3d/view3ds -CubeLine /sys/3d/cubeline Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav #3 **** GRAPHICS **** Image viewer KIV /sys/media/kiv -Image viewer zSea /KolibriOS/media/zsea/zsea +Image viewer zSea /kolibrios/media/zsea/zsea Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** Pixie MP3 Player /sys/media/pixie/pixie -Fplay - video /KolibriOS/media/fplay-full +Fplay - video /kolibrios/media/fplay-full MidAMP /sys/media/midamp #5 **** PROGRAMMING **** Examples > /@6 @@ -129,10 +128,10 @@ Ekraani suurendusklaas /sys/magnify Ekraani klaviatuur /sys/zkey Mфrgistiku tabel /sys/ASCIIVju #18 **** EMULATORS **** -DOSBox DOS Emulator /KolibriOS/emul/DosBox/dosbox -e80 (ZX Spectrum) /KolibriOS/emul/e80/e80 -FCE Ultra - NES /KolibriOS/emul/fceu/fce -Gameboy Color /KolibriOS/emul/gameboy -ScummVM (adventure) /KolibriOS/emul/scummvm -ZSNES Super Nintendo /KolibriOS/emul/zsnes +DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox +e80 (ZX Spectrum) /kolibrios/emul/e80/e80 +FCE Ultra - NES /kolibrios/emul/fceu/fce +Gameboy Color /kolibrios/emul/gameboy +ScummVM (adventure) /kolibrios/emul/scummvm +ZSNES Super Nintendo /kolibrios/emul/zsnes ## diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index 064947b9a0..26f9b5a4fe 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -31,7 +31,6 @@ ScreenSaver /sys/3d/crownscr Labirinto 3D /sys/3d/free3d04 Cuore 3D /sys/3d/3dsheart View3DS /sys/3d/view3ds -CubeLine /sys/3d/cubeline Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav #3 **** GRAPHICS **** diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 0ef30b7917..2c7fbceee6 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -31,19 +31,18 @@ UnvWater /sys/demos/unvwater 3D-Лабиринт /sys/3d/free3d04 Сердце /sys/3d/3dsheart Просмотрщик 3DS /sys/3d/view3ds -CubeLine /sys/3d/cubeline Шестерёнки /sys/3d/gears FlatWave /sys/3d/flatwav 3D-Волны /sys/3d/3dwav #3 **** Графика **** Просмотр фото KIV /sys/media/kiv -Просмотр фото zSea /KolibriOS/media/zsea/zsea +Просмотр фото zSea /kolibrios/media/zsea/zsea Редактор Animage /sys/media/animage Наложение фильтров /sys/media/imgf/imgf Палитра /sys/media/palitra #4 **** Мультимедиа **** Аудиоплеер Pixie /sys/media/pixie/pixie -Видеоплеер Fplay /KolibriOS/media/fplay-full +Видеоплеер Fplay /kolibrios/media/fplay-full Midi-плеер /sys/media/midamp #5 **** Разработка **** Примеры > /@6 @@ -133,10 +132,10 @@ DNS lookup /sys/network/nslookup Бинарные часы /sys/demos/bcdclk Таймер /sys/demos/timer #18 **** Эмуляторы **** -DOSBox DOS Emulator /KolibriOS/emul/DosBox/dosbox -e80 (ZX Spectrum) /KolibriOS/emul/e80/e80 -FCE Ultra - NES /KolibriOS/emul/fceu/fce -Gameboy Color /KolibriOS/emul/gameboy -ScummVM (adventure) /KolibriOS/emul/scummvm -ZSNES Super Nintendo /KolibriOS/emul/zsnes +DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox +e80 (ZX Spectrum) /kolibrios/emul/e80/e80 +FCE Ultra - NES /kolibrios/emul/fceu/fce +Gameboy Color /kolibrios/emul/gameboy +ScummVM (adventure) /kolibrios/emul/scummvm +ZSNES Super Nintendo /kolibrios/emul/zsnes ## diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index 1759543ee7..5a47160b80 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -31,18 +31,17 @@ ScreenSaver /sys/3d/crownscr 3D-labyrinth /sys/3d/free3d04 Heart /sys/3d/3dsheart View3DS /sys/3d/view3ds -CubeLine /sys/3d/cubeline Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav #3 **** GR╡FICOS **** Image viewer KIV /sys/media/kiv -Image viewer zSea /KolibriOS/media/zsea/zsea +Image viewer zSea /kolibrios/media/zsea/zsea Animage /sys/media/animage Efectos de imаgenes /sys/media/imgf/imgf Palitra /sys/media/palitra #4 **** MULTIMEDIA **** Pixie MP3 Player /sys/media/pixie/pixie -Fplay - video /KolibriOS/media/fplay-full +Fplay - video /kolibrios/media/fplay-full MidAMP /sys/media/midamp #5 **** DESARROLLO **** Ejemplos > /@6 @@ -129,10 +128,10 @@ Ampliaci Teclado en pantalla /sys/zkey Tabla de caracteres /sys/ASCIIVju #18 **** EMULATORS **** -DOSBox DOS Emulator /KolibriOS/emul/DosBox/dosbox -e80 (ZX Spectrum) /KolibriOS/emul/e80/e80 -FCE Ultra - NES /KolibriOS/emul/fceu/fce -Gameboy Color /KolibriOS/emul/gameboy -ScummVM (adventure) /KolibriOS/emul/scummvm -ZSNES Super Nintendo /KolibriOS/emul/zsnes +DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox +e80 (ZX Spectrum) /kolibrios/emul/e80/e80 +FCE Ultra - NES /kolibrios/emul/fceu/fce +Gameboy Color /kolibrios/emul/gameboy +ScummVM (adventure) /kolibrios/emul/scummvm +ZSNES Super Nintendo /kolibrios/emul/zsnes ##