From 6b6de1e57280210b67c69fa99da6501d36b2821a Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Mon, 25 Jul 2011 14:47:55 +0000 Subject: [PATCH] move atikms to the CD image git-svn-id: svn://kolibrios.org@2021 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 9 +++++++-- data/rus/Makefile | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/data/eng/Makefile b/data/eng/Makefile index 5be7a32966..802cf34cc4 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -114,7 +114,6 @@ FASM_PROGRAMS:=\ develop/test_gets:DEVELOP/test_gets:$(PROGS)/develop/libraries/console/examples/test_gets.asm \ develop/testcon2:DEVELOP/TESTCON2:$(PROGS)/develop/libraries/console/examples/testcon2.asm \ develop/thread:DEVELOP/THREAD:$(PROGS)/develop/examples/thread/trunk/thread.asm \ - drivers/atikms:DRIVERS/ATIKMS:$(REPOSITORY)/drivers/video/drm/radeon/atikms.asm \ drivers/com_mouse.obj:DRIVERS/COM_MOUSE.OBJ:$(KERNEL)/drivers/com_mouse.asm \ drivers/emu10k1x.obj:DRIVERS/EMU10K1X.OBJ:$(KERNEL)/drivers/emu10k1x.asm \ drivers/fm801.obj:DRIVERS/FM801.OBJ:$(KERNEL)/drivers/fm801.asm \ @@ -186,6 +185,11 @@ FASM_PROGRAMS:=\ network/ym:NETWORK/YM:$(PROGS)/network/ym/trunk/ym.asm \ network/zeroconf:NETWORK/ZEROCONF:$(PROGS)/network/zeroconf/trunk/zeroconf.asm \ # end of list +# The list of all FASM programs with one main FASM file for CD image. +# Format of an item is exactly the same as in the previous list. +FASM_PROGRAMS_CD:=\ + drivers/atikms:DRIVERS/ATIKMS:$(REPOSITORY)/drivers/video/drm/radeon/atikms.asm \ +# end of list # The list of all NASM programs with one main NASM file. # Format of an item is exactly the same as in the previous list. @@ -258,7 +262,6 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \ demos/barge.lif:DEMOS/BARGE.LIF demos/life2:DEMOS/LIFE2 \ demos/relay.lif:DEMOS/RELAY.LIF demos/rpento.lif:DEMOS/RPENTO.LIF \ demos/use_mb:DEMOS/USE_MB \ - drivers/atikms.dll:DRIVERS/ATIKMS.DLL \ File|Managers/eolite.ini:File|Managers/EOLITE.INI \ File|Managers/icons.ini:File|Managers/ICONS.INI \ File|Managers/kfar.ini:File|Managers/KFAR.INI \ @@ -281,6 +284,8 @@ MKISOFS_EXTRA:=\ dosbox/=$(PROGS)/emulator/DosBox/dosbox \ dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ + /=drivers/atikms \ + /=drivers/atikms.dll \ #end of list # Some macro for convenient work. diff --git a/data/rus/Makefile b/data/rus/Makefile index f599af11ac..79a8b43e4d 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -114,7 +114,6 @@ FASM_PROGRAMS:=\ develop/test_gets:DEVELOP/test_gets:$(PROGS)/develop/libraries/console/examples/test_gets.asm \ develop/testcon2:DEVELOP/TESTCON2:$(PROGS)/develop/libraries/console/examples/testcon2.asm \ develop/thread:DEVELOP/THREAD:$(PROGS)/develop/examples/thread/trunk/thread.asm \ - drivers/atikms:DRIVERS/ATIKMS:$(REPOSITORY)/drivers/video/drm/radeon/atikms.asm \ drivers/com_mouse.obj:DRIVERS/COM_MOUSE.OBJ:$(KERNEL)/drivers/com_mouse.asm \ drivers/emu10k1x.obj:DRIVERS/EMU10K1X.OBJ:$(KERNEL)/drivers/emu10k1x.asm \ drivers/fm801.obj:DRIVERS/FM801.OBJ:$(KERNEL)/drivers/fm801.asm \ @@ -185,6 +184,11 @@ FASM_PROGRAMS:=\ network/ym:NETWORK/YM:$(PROGS)/network/ym/trunk/ym.asm \ network/zeroconf:NETWORK/ZEROCONF:$(PROGS)/network/zeroconf/trunk/zeroconf.asm \ # end of list +# The list of all FASM programs with one main FASM file for CD image. +# Format of an item is exactly the same as in the previous list. +FASM_PROGRAMS_CD:=\ + drivers/atikms:DRIVERS/ATIKMS:$(REPOSITORY)/drivers/video/drm/radeon/atikms.asm \ +# end of list # The list of all NASM programs with one main NASM file. # Format of an item is exactly the same as in the previous list. @@ -250,7 +254,6 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \ demos/barge.lif:DEMOS/BARGE.LIF demos/life2:DEMOS/LIFE2 \ demos/relay.lif:DEMOS/RELAY.LIF demos/rpento.lif:DEMOS/RPENTO.LIF \ demos/use_mb:DEMOS/USE_MB \ - drivers/atikms.dll:DRIVERS/ATIKMS.DLL \ File|Managers/eolite.ini:File|Managers/EOLITE.INI \ File|Managers/icons.ini:File|Managers/ICONS.INI \ File|Managers/kfar.ini:File|Managers/KFAR.INI \ @@ -275,6 +278,8 @@ MKISOFS_EXTRA:=\ dosbox/=$(PROGS)/emulator/DosBox/dosbox \ dosbox/=$(PROGS)/emulator/DosBox/dosbox.conf \ dosbox/=$(PROGS)/emulator/DosBox/readme.txt \ + /=drivers/atikms \ + /=drivers/atikms.dll \ #end of list # Some macro for convenient work.