From 7cb4a478ed54b7676b3ab55f4b9aa54fd3cb6d46 Mon Sep 17 00:00:00 2001 From: Albom Date: Tue, 11 Dec 2012 19:27:27 +0000 Subject: [PATCH] Move ZX Spectrum emulator 'e80' from ramdisk to cd-rom. First and hope the last try. git-svn-id: svn://kolibrios.org@3094 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Vortex86MX-eng/Makefile | 9 +++++---- data/Vortex86MX-eng/menu.dat | 1 - data/eng/Makefile | 9 +++++---- data/eng/menu.dat | 1 - data/rus/Makefile | 9 +++++---- data/rus/menu.dat | 1 - 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data/Vortex86MX-eng/Makefile b/data/Vortex86MX-eng/Makefile index 5558bbff06..afcf928819 100644 --- a/data/Vortex86MX-eng/Makefile +++ b/data/Vortex86MX-eng/Makefile @@ -244,7 +244,7 @@ CMM_PROGRAMS:=\ # Spaces should be represented as |. OTHER_FILES:=autorun.dat:AUTORUN.DAT \ background.png:background.png default.skn:DEFAULT.SKN \ - e80:E80 graph:GRAPH hdread:HDREAD \ + graph:GRAPH hdread:HDREAD \ icons.dat:ICONS.DAT iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ @@ -270,9 +270,10 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ # Extra targets for LiveCD image in the syntax of mkisofs MKISOFS_EXTRA:=\ - dosbox/=$(PROGS)/emulator/DosBox/dosbox \ - dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ - dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ + emu/e80/e80=E80 \ + emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox \ + emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ + emu/dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ #end of list # Some macro for convenient work. diff --git a/data/Vortex86MX-eng/menu.dat b/data/Vortex86MX-eng/menu.dat index d6dc0d65fe..7604ba9866 100644 --- a/data/Vortex86MX-eng/menu.dat +++ b/data/Vortex86MX-eng/menu.dat @@ -14,7 +14,6 @@ Shutdown /rd/1/end #1 **** GAMES **** Logical games > /@2 Arcades > /@3 -Spectrum emulator /rd/1/e80 Memory Blocks /rd/1/games/mblocks FreeCell /rd/1/games/freecell Pipes /rd/1/games/pipes diff --git a/data/eng/Makefile b/data/eng/Makefile index 4864d521d5..268a97f85e 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -264,7 +264,7 @@ CMM_PROGRAMS:=\ # Spaces should be represented as |. OTHER_FILES:=autorun.dat:AUTORUN.DAT \ background.png:background.png default.skn:DEFAULT.SKN \ - e80:E80 graph:GRAPH hdread:HDREAD \ + graph:GRAPH hdread:HDREAD \ icons.dat:ICONS.DAT iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ @@ -297,9 +297,10 @@ include Makefile.skins # Extra targets for LiveCD image in the syntax of mkisofs MKISOFS_EXTRA:=\ - dosbox/=$(PROGS)/emulator/DosBox/dosbox \ - dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ - dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ + emu/e80/e80=E80 \ + emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox \ + emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ + emu/dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ /=distr_data/autorun.inf \ /=distr_data/KolibriOS_icon.ico \ /=distr_data/readme.txt \ diff --git a/data/eng/menu.dat b/data/eng/menu.dat index e8641efc84..88062f2af2 100644 --- a/data/eng/menu.dat +++ b/data/eng/menu.dat @@ -14,7 +14,6 @@ Shutdown /rd/1/end #1 **** GAMES **** Logical games > /@2 Arcades > /@3 -Spectrum emulator /rd/1/e80 Memory Blocks /rd/1/games/mblocks FreeCell /rd/1/games/freecell Pipes /rd/1/games/pipes diff --git a/data/rus/Makefile b/data/rus/Makefile index c0ac2a5581..7bd7540e0c 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -258,7 +258,7 @@ CMM_PROGRAMS:=\ # yogev_ezra: Removed '3dsheart' to free some space on RAMDISK. This demo has 90% in common with VIEW3DS OTHER_FILES:=autorun.dat:AUTORUN.DAT \ background.png:background.png default.skn:DEFAULT.SKN \ - e80:E80 graph:GRAPH hdread:HDREAD \ + graph:GRAPH hdread:HDREAD \ icons.dat:ICONS.DAT iconstrp.png:ICONSTRP.PNG index_htm:INDEX.HTM \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ @@ -293,9 +293,10 @@ include Makefile.skins # Extra targets for LiveCD image in the syntax of mkisofs MKISOFS_EXTRA:=\ - dosbox/=$(PROGS)/emulator/DosBox/dosbox \ - dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ - dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ + emu/e80/e80=E80 \ + emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox \ + emu/dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ + emu/dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ /=distr_data/autorun.inf \ /=distr_data/KolibriOS_icon.ico \ /=distr_data/readme.txt \ diff --git a/data/rus/menu.dat b/data/rus/menu.dat index f2839e0c46..f10cfa030c 100644 --- a/data/rus/menu.dat +++ b/data/rus/menu.dat @@ -14,7 +14,6 @@ #1 **** GAMES **** Логические > /@2 Аркады > /@3 -Эмулятор Spectrum /rd/1/e80 Memory Blocks /rd/1/games/mblocks FreeCell /rd/1/games/freecell Трубопровод /rd/1/games/pipes