KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

use nasm Timer in all other distros

Browse Source 
git-svn-id: svn://kolibrios.org@4047 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2013-10-17 15:54:09 +00:00
parent 2343b044e8
commit 027f9d30ba
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/eng/Makefile
View File

@ -93,7 +93,6 @@ FASM_PROGRAMS:=\
demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \ demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \
demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \ demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \
demos/plasma:DEMOS/PLASMA:$(PROGS)/demos/plasma/trunk/plasma.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/tinyfrac:DEMOS/TINYFRAC:$(PROGS)/demos/tinyfrac/trunk/tinyfrac.asm \
demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \ demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \
demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.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. # Format of an item is exactly the same as in the previous list.
NASM_PROGRAMS:=\ NASM_PROGRAMS:=\
demos/aclock:DEMOS/ACLOCK:$(PROGS)/demos/aclock/trunk/aclock.asm \ 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 \ games/c4:GAMES/C4:$(PROGS)/games/c4/trunk/c4.asm \
# end of list # end of list

2
data/et/Makefile
View File

@ -93,7 +93,6 @@ FASM_PROGRAMS:=\
demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \ demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \
demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \ demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \
demos/plasma:DEMOS/PLASMA:$(PROGS)/demos/plasma/trunk/plasma.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/tinyfrac:DEMOS/TINYFRAC:$(PROGS)/demos/tinyfrac/trunk/tinyfrac.asm \
demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \ demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \
demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.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. # Format of an item is exactly the same as in the previous list.
NASM_PROGRAMS:=\ NASM_PROGRAMS:=\
demos/aclock:DEMOS/ACLOCK:$(PROGS)/demos/aclock/trunk/aclock.asm \ 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 \ games/c4:GAMES/C4:$(PROGS)/games/c4/trunk/c4.asm \
# end of list # end of list

2
data/it/Makefile
View File

@ -93,7 +93,6 @@ FASM_PROGRAMS:=\
demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \ demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \
demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \ demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \
demos/plasma:DEMOS/PLASMA:$(PROGS)/demos/plasma/trunk/plasma.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/tinyfrac:DEMOS/TINYFRAC:$(PROGS)/demos/tinyfrac/trunk/tinyfrac.asm \
demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \ demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \
demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.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. # Format of an item is exactly the same as in the previous list.
NASM_PROGRAMS:=\ NASM_PROGRAMS:=\
demos/aclock:DEMOS/ACLOCK:$(PROGS)/demos/aclock/trunk/aclock.asm \ 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 \ games/c4:GAMES/C4:$(PROGS)/games/c4/trunk/c4.asm \
# end of list # end of list

2
data/sp/Makefile
View File

@ -93,7 +93,6 @@ FASM_PROGRAMS:=\
demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \ demos/firework:DEMOS/FIREWORK:$(PROGS)/demos/firework/trunk/firework.asm \
demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \ demos/movback:DEMOS/MOVBACK:$(PROGS)/demos/movback/trunk/movback.asm \
demos/plasma:DEMOS/PLASMA:$(PROGS)/demos/plasma/trunk/plasma.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/tinyfrac:DEMOS/TINYFRAC:$(PROGS)/demos/tinyfrac/trunk/tinyfrac.asm \
demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \ demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \
demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.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. # Format of an item is exactly the same as in the previous list.
NASM_PROGRAMS:=\ NASM_PROGRAMS:=\
demos/aclock:DEMOS/ACLOCK:$(PROGS)/demos/aclock/trunk/aclock.asm \ 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 \ games/c4:GAMES/C4:$(PROGS)/games/c4/trunk/c4.asm \
# end of list # end of list