From 027f9d30baa75a1607d230329ec0e9b79212e173 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 17 Oct 2013 15:54:09 +0000 Subject: [PATCH] use nasm Timer in all other distros git-svn-id: svn://kolibrios.org@4047 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 2 +- data/et/Makefile | 2 +- data/it/Makefile | 2 +- data/sp/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/eng/Makefile b/data/eng/Makefile index a21658c41d..7d5e9621d6 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -93,7 +93,6 @@ FASM_PROGRAMS:=\ demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \ demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \ demos/plasma:DEMOS/PLASMA:$(PROGS)/demos/plasma/trunk/plasma.asm \ - demos/timer:DEMOS/TIMER:$(PROGS)/demos/timer/trunk/timer.asm \ demos/tinyfrac:DEMOS/TINYFRAC:$(PROGS)/demos/tinyfrac/trunk/tinyfrac.asm \ demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \ demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.asm \ @@ -234,6 +233,7 @@ FASM_NOKPACK_PROGRAMS:=\ # Format of an item is exactly the same as in the previous list. NASM_PROGRAMS:=\ demos/aclock:DEMOS/ACLOCK:$(PROGS)/demos/aclock/trunk/aclock.asm \ + demos/timer:DEMOS/Timer:$(PROGS)/other/Timer/Timer.asm \ games/c4:GAMES/C4:$(PROGS)/games/c4/trunk/c4.asm \ # end of list diff --git a/data/et/Makefile b/data/et/Makefile index a21658c41d..7d5e9621d6 100644 --- a/data/et/Makefile +++ b/data/et/Makefile @@ -93,7 +93,6 @@ FASM_PROGRAMS:=\ demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \ demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \ demos/plasma:DEMOS/PLASMA:$(PROGS)/demos/plasma/trunk/plasma.asm \ - demos/timer:DEMOS/TIMER:$(PROGS)/demos/timer/trunk/timer.asm \ demos/tinyfrac:DEMOS/TINYFRAC:$(PROGS)/demos/tinyfrac/trunk/tinyfrac.asm \ demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \ demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.asm \ @@ -234,6 +233,7 @@ FASM_NOKPACK_PROGRAMS:=\ # Format of an item is exactly the same as in the previous list. NASM_PROGRAMS:=\ demos/aclock:DEMOS/ACLOCK:$(PROGS)/demos/aclock/trunk/aclock.asm \ + demos/timer:DEMOS/Timer:$(PROGS)/other/Timer/Timer.asm \ games/c4:GAMES/C4:$(PROGS)/games/c4/trunk/c4.asm \ # end of list diff --git a/data/it/Makefile b/data/it/Makefile index ce50398440..bb7f35157c 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -93,7 +93,6 @@ FASM_PROGRAMS:=\ demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \ demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \ demos/plasma:DEMOS/PLASMA:$(PROGS)/demos/plasma/trunk/plasma.asm \ - demos/timer:DEMOS/TIMER:$(PROGS)/demos/timer/trunk/timer.asm \ demos/tinyfrac:DEMOS/TINYFRAC:$(PROGS)/demos/tinyfrac/trunk/tinyfrac.asm \ demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \ demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.asm \ @@ -234,6 +233,7 @@ FASM_NOKPACK_PROGRAMS:=\ # Format of an item is exactly the same as in the previous list. NASM_PROGRAMS:=\ demos/aclock:DEMOS/ACLOCK:$(PROGS)/demos/aclock/trunk/aclock.asm \ + demos/timer:DEMOS/Timer:$(PROGS)/other/Timer/Timer.asm \ games/c4:GAMES/C4:$(PROGS)/games/c4/trunk/c4.asm \ # end of list diff --git a/data/sp/Makefile b/data/sp/Makefile index 78bee32129..de644d23d2 100644 --- a/data/sp/Makefile +++ b/data/sp/Makefile @@ -93,7 +93,6 @@ FASM_PROGRAMS:=\ demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \ demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \ demos/plasma:DEMOS/PLASMA:$(PROGS)/demos/plasma/trunk/plasma.asm \ - demos/timer:DEMOS/TIMER:$(PROGS)/demos/timer/trunk/timer.asm \ demos/tinyfrac:DEMOS/TINYFRAC:$(PROGS)/demos/tinyfrac/trunk/tinyfrac.asm \ demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \ demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.asm \ @@ -234,6 +233,7 @@ FASM_NOKPACK_PROGRAMS:=\ # Format of an item is exactly the same as in the previous list. NASM_PROGRAMS:=\ demos/aclock:DEMOS/ACLOCK:$(PROGS)/demos/aclock/trunk/aclock.asm \ + demos/timer:DEMOS/Timer:$(PROGS)/other/Timer/Timer.asm \ games/c4:GAMES/C4:$(PROGS)/games/c4/trunk/c4.asm \ # end of list