KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

menu.dat: remove cubeline, replace /KolibriOS/ by /kolibrios/ as it is case sensitive now,

Browse Source 
3D/Gears: replace C version by ASM version

git-svn-id: svn://kolibrios.org@6736 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2016-11-21 20:51:18 +00:00
parent b380ebc490
commit 6a851c29a8
7 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/Tupfile.lua
View File

@@ -157,7 +157,6 @@ extra_files = {
{"kolibrios/3D/voxel_utilites/TOOLBAR_T.PNG" , PROGS .. "/media/voxel_editor/utilites/toolbar_t.png"}, {"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/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/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_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/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"}, {"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/3DWAV", PROGS .. "/demos/3dwav/trunk/3dwav"},
{"3D/CROWNSCR", PROGS .. "/demos/crownscr/trunk/crownscr"}, {"3D/CROWNSCR", PROGS .. "/demos/crownscr/trunk/crownscr"},
{"3D/FREE3D04", PROGS .. "/demos/free3d04/trunk/free3d04"}, {"3D/FREE3D04", PROGS .. "/demos/free3d04/trunk/free3d04"},
{"3D/GEARS", PROGS .. "/develop/libraries/TinyGL/asm_fork/examples/gears"},
{"3D/RAY", PROGS .. "/demos/ray/ray"}, {"3D/RAY", PROGS .. "/demos/ray/ray"},
{"3D/VIEW3DS", PROGS .. "/demos/3DS/VIEW3DS"}, {"3D/VIEW3DS", PROGS .. "/demos/3DS/VIEW3DS"},
{"DEMOS/BCDCLK", PROGS .. "/demos/bcdclk/trunk/bcdclk"}, {"DEMOS/BCDCLK", PROGS .. "/demos/bcdclk/trunk/bcdclk"},
@@ -573,13 +573,12 @@ end -- tup.getconfig('NO_MSVC') ~= 'full'
-- Programs that require GCC to compile. -- Programs that require GCC to compile.
if tup.getconfig('NO_GCC') ~= 'full' then if tup.getconfig('NO_GCC') ~= 'full' then
tup.append_table(img_files, { tup.append_table(img_files, {
{"3D/GEARS", PROGS .. "/demos/gears/trunk/gears"},
{"GAMES/CHECKERS", PROGS .. "/games/checkers/trunk/checkers"}, {"GAMES/CHECKERS", PROGS .. "/games/checkers/trunk/checkers"},
{"GAMES/REVERSI", PROGS .. "/games/reversi/trunk/reversi"}, {"GAMES/REVERSI", PROGS .. "/games/reversi/trunk/reversi"},
{"SHELL", PROGS .. "/system/shell/shell"}, {"SHELL", PROGS .. "/system/shell/shell"},
}) })
tup.append_table(extra_files, { 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/emul/e80/e80", PROGS .. "/emulator/e80/trunk/e80"},
{"kolibrios/games/2048/", PROGS .. "/games/2048/2048"}, {"kolibrios/games/2048/", PROGS .. "/games/2048/2048"},
{"kolibrios/games/donkey", PROGS .. "/games/donkey/donkey"}, {"kolibrios/games/donkey", PROGS .. "/games/donkey/donkey"},

6
data/common/settings/app_plus.ini
View File

@@ -15,8 +15,10 @@ Info3DsUser=/kolibrios/3d/info3ds/info3ds_u,75
VoxelEditor=/kolibrios/3d/voxel_editor/voxel_editor,30 VoxelEditor=/kolibrios/3d/voxel_editor/voxel_editor,30
[3D Demos] [3D Demos]
3dsHeart=/kolibrios/3d/3dsheart,78 3dsHeart=/kolibrios/3D/3dsheart,78
M2View=/kolibrios/3d/md2view/md2view,78 Cubeline=/kolibrios/3D/cubeline,78
M2View=/kolibrios/3D/md2view/md2view,78
Globe=/kolibrios/3D/TEXTURES1,78
[Other] [Other]
Calc+=/kolibrios/utils/calcplus,4 Calc+=/kolibrios/utils/calcplus,4

21
data/eng/settings/menu.dat
View File

@@ -21,7 +21,7 @@ Eyes /sys/demos/eyes
Tube /sys/demos/tube Tube /sys/demos/tube
Plasma /sys/demos/plasma Plasma /sys/demos/plasma
Moveback /sys/demos/movback Moveback /sys/demos/movback
Life* /KolibriOS/demos/life2 Life* /kolibrios/demos/life2
TranTest /sys/demos/trantest TranTest /sys/demos/trantest
WEB /sys/demos/web WEB /sys/demos/web
FireWork /sys/demos/firework FireWork /sys/demos/firework
@@ -29,20 +29,19 @@ UnvWater /sys/demos/unvwater
#2 **** 3D demos **** #2 **** 3D demos ****
ScreenSaver /sys/3d/crownscr ScreenSaver /sys/3d/crownscr
3D-labyrinth /sys/3d/free3d04 3D-labyrinth /sys/3d/free3d04
Heart* /KolibriOS/3d/3dsheart Heart* /kolibrios/3d/3dsheart
View3DS /sys/3d/view3ds View3DS /sys/3d/view3ds
CubeLine /sys/3d/cubeline
Gears /sys/3d/gears Gears /sys/3d/gears
3D-waved area /sys/3d/3dwav 3D-waved area /sys/3d/3dwav
#3 **** GRAPHICS **** #3 **** GRAPHICS ****
Kolibri Image Viewer /sys/media/kiv Kolibri Image Viewer /sys/media/kiv
zSea* (image viewer) /KolibriOS/media/zsea/zsea zSea* (image viewer) /kolibrios/media/zsea/zsea
Animage /sys/media/animage Animage /sys/media/animage
Image Filtering /sys/media/imgf/imgf Image Filtering /sys/media/imgf/imgf
Palitra /sys/media/palitra Palitra /sys/media/palitra
#4 **** MULTIMEDIA **** #4 **** MULTIMEDIA ****
Pixie (MP3 player) /sys/media/pixie/pixie 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 MidAMP /sys/media/midamp
#5 **** PROGRAMMING **** #5 **** PROGRAMMING ****
Examples > /@6 Examples > /@6
@@ -129,10 +128,10 @@ Screen magnifier /sys/magnify
Screen keyboard /sys/zkey Screen keyboard /sys/zkey
Character table /sys/ASCIIVju Character table /sys/ASCIIVju
#18 **** EMULATORS **** #18 **** EMULATORS ****
DOSBox* (DOS PC) /KolibriOS/emul/DosBox/dosbox DOSBox* (DOS PC) /kolibrios/emul/DosBox/dosbox
e80* (ZX Spectrum) /KolibriOS/emul/e80/e80 e80* (ZX Spectrum) /kolibrios/emul/e80/e80
FCE Ultra* (NES) /KolibriOS/emul/fceu/fce FCE Ultra* (NES) /kolibrios/emul/fceu/fce
Gameboy Color* /KolibriOS/emul/gameboy Gameboy Color* /kolibrios/emul/gameboy
ScummVM* (adventure) /KolibriOS/emul/scummvm ScummVM* (adventure) /kolibrios/emul/scummvm
ZSNES* (super Nintendo) /KolibriOS/emul/zsnes ZSNES* (super Nintendo) /kolibrios/emul/zsnes
## ##

17
data/et/settings/menu.dat
View File

@@ -31,18 +31,17 @@ ScreenSaver /sys/3d/crownscr
3D-labyrinth /sys/3d/free3d04 3D-labyrinth /sys/3d/free3d04
Heart /sys/3d/3dsheart Heart /sys/3d/3dsheart
View3DS /sys/3d/view3ds View3DS /sys/3d/view3ds
CubeLine /sys/3d/cubeline
Gears /sys/3d/gears Gears /sys/3d/gears
3D-waved area /sys/3d/3dwav 3D-waved area /sys/3d/3dwav
#3 **** GRAPHICS **** #3 **** GRAPHICS ****
Image viewer KIV /sys/media/kiv Image viewer KIV /sys/media/kiv
Image viewer zSea /KolibriOS/media/zsea/zsea Image viewer zSea /kolibrios/media/zsea/zsea
Animage /sys/media/animage Animage /sys/media/animage
Image Filtering /sys/media/imgf/imgf Image Filtering /sys/media/imgf/imgf
Palitra /sys/media/palitra Palitra /sys/media/palitra
#4 **** MULTIMEDIA **** #4 **** MULTIMEDIA ****
Pixie MP3 Player /sys/media/pixie/pixie Pixie MP3 Player /sys/media/pixie/pixie
Fplay - video /KolibriOS/media/fplay-full Fplay - video /kolibrios/media/fplay-full
MidAMP /sys/media/midamp MidAMP /sys/media/midamp
#5 **** PROGRAMMING **** #5 **** PROGRAMMING ****
Examples > /@6 Examples > /@6
@@ -129,10 +128,10 @@ Ekraani suurendusklaas /sys/magnify
Ekraani klaviatuur /sys/zkey Ekraani klaviatuur /sys/zkey
M<EFBFBD>rgistiku tabel /sys/ASCIIVju M<EFBFBD>rgistiku tabel /sys/ASCIIVju
#18 **** EMULATORS **** #18 **** EMULATORS ****
DOSBox DOS Emulator /KolibriOS/emul/DosBox/dosbox DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox
e80 (ZX Spectrum) /KolibriOS/emul/e80/e80 e80 (ZX Spectrum) /kolibrios/emul/e80/e80
FCE Ultra - NES /KolibriOS/emul/fceu/fce FCE Ultra - NES /kolibrios/emul/fceu/fce
Gameboy Color /KolibriOS/emul/gameboy Gameboy Color /kolibrios/emul/gameboy
ScummVM (adventure) /KolibriOS/emul/scummvm ScummVM (adventure) /kolibrios/emul/scummvm
ZSNES Super Nintendo /KolibriOS/emul/zsnes ZSNES Super Nintendo /kolibrios/emul/zsnes
## ##

1
data/it/settings/menu.dat
View File

@@ -31,7 +31,6 @@ ScreenSaver /sys/3d/crownscr
Labirinto 3D /sys/3d/free3d04 Labirinto 3D /sys/3d/free3d04
Cuore 3D /sys/3d/3dsheart Cuore 3D /sys/3d/3dsheart
View3DS /sys/3d/view3ds View3DS /sys/3d/view3ds
CubeLine /sys/3d/cubeline
Gears /sys/3d/gears Gears /sys/3d/gears
3D-waved area /sys/3d/3dwav 3D-waved area /sys/3d/3dwav
#3 **** GRAPHICS **** #3 **** GRAPHICS ****

17
data/rus/settings/menu.dat
View File

@@ -31,19 +31,18 @@ UnvWater /sys/demos/unvwater
3D-<2D><><EFBFBD><EFBFBD>ਭ<EFBFBD> /sys/3d/free3d04 3D-<2D><><EFBFBD><EFBFBD>ਭ<EFBFBD> /sys/3d/free3d04
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> /sys/3d/3dsheart <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> /sys/3d/3dsheart
<EFBFBD><EFBFBD><EFBFBD>ᬮ<EFBFBD><EFBFBD>騪 3DS /sys/3d/view3ds <EFBFBD><EFBFBD><EFBFBD>ᬮ<EFBFBD><EFBFBD>騪 3DS /sys/3d/view3ds
CubeLine /sys/3d/cubeline
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>񭪨 /sys/3d/gears <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>񭪨 /sys/3d/gears
FlatWave /sys/3d/flatwav FlatWave /sys/3d/flatwav
3D-<2D><><EFBFBD><EFBFBD><EFBFBD> /sys/3d/3dwav 3D-<2D><><EFBFBD><EFBFBD><EFBFBD> /sys/3d/3dwav
#3 **** <20><><EFBFBD>䨪<EFBFBD> **** #3 **** <20><><EFBFBD>䨪<EFBFBD> ****
<EFBFBD><EFBFBD><EFBFBD>ᬮ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> KIV /sys/media/kiv <EFBFBD><EFBFBD><EFBFBD>ᬮ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> KIV /sys/media/kiv
<EFBFBD><EFBFBD><EFBFBD>ᬮ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> zSea /KolibriOS/media/zsea/zsea <EFBFBD><EFBFBD><EFBFBD>ᬮ<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> zSea /kolibrios/media/zsea/zsea
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Animage /sys/media/animage <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Animage /sys/media/animage
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 䨫<><E4A8AB>஢ /sys/media/imgf/imgf <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 䨫<><E4A8AB>஢ /sys/media/imgf/imgf
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> /sys/media/palitra <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> /sys/media/palitra
#4 **** <20><><EFBFBD><EFBFBD>⨬<EFBFBD><E2A8AC><EFBFBD><EFBFBD> **** #4 **** <20><><EFBFBD><EFBFBD>⨬<EFBFBD><E2A8AC><EFBFBD><EFBFBD> ****
<EFBFBD>㤨<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Pixie /sys/media/pixie/pixie <EFBFBD>㤨<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Pixie /sys/media/pixie/pixie
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Fplay /KolibriOS/media/fplay-full <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Fplay /kolibrios/media/fplay-full
Midi-<2D><><EFBFBD><EFBFBD><EFBFBD> /sys/media/midamp Midi-<2D><><EFBFBD><EFBFBD><EFBFBD> /sys/media/midamp
#5 **** <20><><EFBFBD>ࠡ<EFBFBD>⪠ **** #5 **** <20><><EFBFBD>ࠡ<EFBFBD>⪠ ****
<EFBFBD>ਬ<EFBFBD><EFBFBD><EFBFBD> > /@6 <EFBFBD>ਬ<EFBFBD><EFBFBD><EFBFBD> > /@6
@@ -133,10 +132,10 @@ DNS lookup /sys/network/nslookup
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> /sys/demos/bcdclk <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> /sys/demos/bcdclk
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> /sys/demos/timer <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> /sys/demos/timer
#18 **** <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> **** #18 **** <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ****
DOSBox DOS Emulator /KolibriOS/emul/DosBox/dosbox DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox
e80 (ZX Spectrum) /KolibriOS/emul/e80/e80 e80 (ZX Spectrum) /kolibrios/emul/e80/e80
FCE Ultra - NES /KolibriOS/emul/fceu/fce FCE Ultra - NES /kolibrios/emul/fceu/fce
Gameboy Color /KolibriOS/emul/gameboy Gameboy Color /kolibrios/emul/gameboy
ScummVM (adventure) /KolibriOS/emul/scummvm ScummVM (adventure) /kolibrios/emul/scummvm
ZSNES Super Nintendo /KolibriOS/emul/zsnes ZSNES Super Nintendo /kolibrios/emul/zsnes
## ##

17
data/sp/settings/menu.dat
View File

@@ -31,18 +31,17 @@ ScreenSaver /sys/3d/crownscr
3D-labyrinth /sys/3d/free3d04 3D-labyrinth /sys/3d/free3d04
Heart /sys/3d/3dsheart Heart /sys/3d/3dsheart
View3DS /sys/3d/view3ds View3DS /sys/3d/view3ds
CubeLine /sys/3d/cubeline
Gears /sys/3d/gears Gears /sys/3d/gears
3D-waved area /sys/3d/3dwav 3D-waved area /sys/3d/3dwav
#3 **** GR<47>FICOS **** #3 **** GR<47>FICOS ****
Image viewer KIV /sys/media/kiv Image viewer KIV /sys/media/kiv
Image viewer zSea /KolibriOS/media/zsea/zsea Image viewer zSea /kolibrios/media/zsea/zsea
Animage /sys/media/animage Animage /sys/media/animage
Efectos de im<69>genes /sys/media/imgf/imgf Efectos de im<69>genes /sys/media/imgf/imgf
Palitra /sys/media/palitra Palitra /sys/media/palitra
#4 **** MULTIMEDIA **** #4 **** MULTIMEDIA ****
Pixie MP3 Player /sys/media/pixie/pixie Pixie MP3 Player /sys/media/pixie/pixie
Fplay - video /KolibriOS/media/fplay-full Fplay - video /kolibrios/media/fplay-full
MidAMP /sys/media/midamp MidAMP /sys/media/midamp
#5 **** DESARROLLO **** #5 **** DESARROLLO ****
Ejemplos > /@6 Ejemplos > /@6
@@ -129,10 +128,10 @@ Ampliaci
Teclado en pantalla /sys/zkey Teclado en pantalla /sys/zkey
Tabla de caracteres /sys/ASCIIVju Tabla de caracteres /sys/ASCIIVju
#18 **** EMULATORS **** #18 **** EMULATORS ****
DOSBox DOS Emulator /KolibriOS/emul/DosBox/dosbox DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox
e80 (ZX Spectrum) /KolibriOS/emul/e80/e80 e80 (ZX Spectrum) /kolibrios/emul/e80/e80
FCE Ultra - NES /KolibriOS/emul/fceu/fce FCE Ultra - NES /kolibrios/emul/fceu/fce
Gameboy Color /KolibriOS/emul/gameboy Gameboy Color /kolibrios/emul/gameboy
ScummVM (adventure) /KolibriOS/emul/scummvm ScummVM (adventure) /kolibrios/emul/scummvm
ZSNES Super Nintendo /KolibriOS/emul/zsnes ZSNES Super Nintendo /kolibrios/emul/zsnes
## ##