From 32e469b81f492aee779baba0595e59378a330d39 Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Fri, 4 Feb 2011 18:09:40 +0000 Subject: [PATCH] Makefile: use kiv.ini from kiv folder git-svn-id: svn://kolibrios.org@1844 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 6 ++++-- data/eng/media/kiv.ini | 3 --- data/rus/Makefile | 8 +++++--- data/rus/media/kiv.ini | 3 --- programs/media/kiv/trunk/kiv.ini | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 data/eng/media/kiv.ini delete mode 100644 data/rus/media/kiv.ini diff --git a/data/eng/Makefile b/data/eng/Makefile index 2368f55f79..f0f704a10a 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -210,7 +210,9 @@ COPY_FILES:=\ fonts/smal.chr:FONTS/SMAL.CHR:$(PROGS)/demos/bgitest/trunk/FONTS/SMAL.CHR \ fonts/trip.chr:FONTS/TRIP.CHR:$(PROGS)/demos/bgitest/trunk/FONTS/TRIP.CHR \ fonts/tscr.chr:FONTS/TSCR.CHR:$(PROGS)/demos/bgitest/trunk/FONTS/TSCR.CHR \ - games/snake.ini:GAMES/SNAKE.INI:$(PROGS)/games/snake/trunk/snake.ini + games/snake.ini:GAMES/SNAKE.INI:$(PROGS)/games/snake/trunk/snake.ini \ + media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \ +# end of list # The list of all C-- programs with one main C-- file. # Format of an item is exactly the same as in the previous list, @@ -254,7 +256,7 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \ games/xonix:GAMES/XONIX games/megamaze:GAMES/MEGAMAZE \ lib/cnv_png.obj:LIB/CNV_PNG.OBJ lib/msgbox.obj:LIB/MSGBOX.OBJ \ lib/pixlib.obj:LIB/PIXLIB.OBJ lib/sort.obj:LIB/SORT.OBJ \ - media/ac97snd:MEDIA/AC97SND media/kiv.ini:MEDIA/KIV.INI \ + media/ac97snd:MEDIA/AC97SND \ network/jmail:NETWORK/JMAIL network/zeroconf.ini:NETWORK/ZEROCONF.INI \ #end of list #3d/logio.bmp:3D/LOGIO.BMP 3d/cubetext:3D/CUBETEXT diff --git a/data/eng/media/kiv.ini b/data/eng/media/kiv.ini deleted file mode 100644 index 2b4230a836..0000000000 --- a/data/eng/media/kiv.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Shortcuts] -Next=PgDn -Prev=PgUp diff --git a/data/rus/Makefile b/data/rus/Makefile index a0531e732c..d962bba465 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -210,7 +210,9 @@ COPY_FILES:=\ fonts/smal.chr:FONTS/SMAL.CHR:$(PROGS)/demos/bgitest/trunk/FONTS/SMAL.CHR \ fonts/trip.chr:FONTS/TRIP.CHR:$(PROGS)/demos/bgitest/trunk/FONTS/TRIP.CHR \ fonts/tscr.chr:FONTS/TSCR.CHR:$(PROGS)/demos/bgitest/trunk/FONTS/TSCR.CHR \ - games/snake.ini:GAMES/SNAKE.INI:$(PROGS)/games/snake/trunk/snake.ini + games/snake.ini:GAMES/SNAKE.INI:$(PROGS)/games/snake/trunk/snake.ini \ + media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \ +# end of list # The list of all C-- programs with one main C-- file. # Format of an item is exactly the same as in the previous list, @@ -220,7 +222,7 @@ CMM_PROGRAMS:=\ games/clicks:GAMES/CLICKS:$(PROGS)/games/clicks/trunk/clicks.c-- \ games/FindNumbers:GAMES/FindNumbers:$(PROGS)/games/FindNumbers/trunk/FindNumbers.c-- \ games/mine:GAMES/MINE:$(PROGS)/games/mine/trunk/mine.c--:/MEOS \ -# end if list +# end of list # List of other files to be included in the image file. # Some of them are auto-built with special rules, some just exist before build. @@ -257,7 +259,7 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \ games/whowtbam:GAMES/WHOWTBAM games/xonix:GAMES/XONIX \ lib/cnv_png.obj:LIB/CNV_PNG.OBJ lib/msgbox.obj:LIB/MSGBOX.OBJ \ lib/pixlib.obj:LIB/PIXLIB.OBJ lib/sort.obj:LIB/SORT.OBJ \ - media/ac97snd:MEDIA/AC97SND media/kiv.ini:MEDIA/KIV.INI \ + media/ac97snd:MEDIA/AC97SND \ network/jmail:NETWORK/JMAIL network/zeroconf.ini:NETWORK/ZEROCONF.INI \ #end of list #3d/logio.bmp:3D/LOGIO.BMP 3d/cubetext:3D/CUBETEXT diff --git a/data/rus/media/kiv.ini b/data/rus/media/kiv.ini deleted file mode 100644 index 2b4230a836..0000000000 --- a/data/rus/media/kiv.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Shortcuts] -Next=PgDn -Prev=PgUp diff --git a/programs/media/kiv/trunk/kiv.ini b/programs/media/kiv/trunk/kiv.ini index 6cea0233b7..2b4230a836 100644 --- a/programs/media/kiv/trunk/kiv.ini +++ b/programs/media/kiv/trunk/kiv.ini @@ -1,3 +1,3 @@ [Shortcuts] -Next=Right -Prev=Left +Next=PgDn +Prev=PgUp