fix menu.dat, try to add NASM Timer to autobuild

git-svn-id: svn://kolibrios.org@4045 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2013-10-17 15:45:47 +00:00
parent 51ae21e2b3
commit a6949eb2d4
2 changed files with 2 additions and 2 deletions

View File

@ -94,7 +94,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

View File

@ -143,7 +143,7 @@ HEX-।
‘Ąŕ˘Ąŕë > /@18 ‘Ąŕ˘Ąŕë > /@18
Š«¨Ą­âë > /@19 Š«¨Ą­âë > /@19
€˘â® (network.ini) /sys/network/zeroconf €˘â® (network.ini) /sys/network/zeroconf
Ť ©áâŕ®©Ş¨ áĄâ¨ /sys/network/netcfg Ť áâŕ®©Ş¨ áĄâ¨ /sys/network/netcfg
‘â âăá Ż®¤Ş«î祭¨ď /sys/network/netstat ‘â âăá Ż®¤Ş«î祭¨ď /sys/network/netstat
#18 **** ‘Ąâě -> ‘Ąŕ˘Ąŕë **** #18 **** ‘Ąâě -> ‘Ąŕ˘Ąŕë ****
FTP daemon /sys/network/ftpd FTP daemon /sys/network/ftpd