move t_edit to develop/ in night builds
git-svn-id: svn://kolibrios.org@2744 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
4dee14ff27
commit
3278228a4b
@ -78,7 +78,6 @@ FASM_PROGRAMS:=\
|
||||
setup:SETUP:$(PROGS)/system/setup/trunk/setup.asm \
|
||||
test:TEST:$(PROGS)/system/test/trunk/test.asm \
|
||||
tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \
|
||||
t_edit:T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \
|
||||
zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \
|
||||
3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \
|
||||
3d/3dsheart:3D/3DSHEART:$(PROGS)/demos/3dsheart/trunk/3dsheart.asm \
|
||||
@ -111,9 +110,18 @@ FASM_PROGRAMS:=\
|
||||
develop/keyascii:DEVELOP/KEYASCII:$(PROGS)/develop/keyascii/trunk/keyascii.asm \
|
||||
develop/mtdbg:DEVELOP/MTDBG:$(PROGS)/develop/mtdbg/mtdbg.asm \
|
||||
develop/scancode:DEVELOP/SCANCODE:$(PROGS)/develop/scancode/trunk/scancode.asm \
|
||||
develop/t_edit:DEVELOP/T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \
|
||||
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 \
|
||||
develop/info/asm.syn:DEVELOP/INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \
|
||||
develop/info/cpp_kol_cla.syn:DEVELOP/INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \
|
||||
develop/info/cpp_kol_dar.syn:DEVELOP/INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \
|
||||
develop/info/cpp_kol_def.syn:DEVELOP/INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \
|
||||
develop/info/default.syn:DEVELOP/INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \
|
||||
develop/info/html.syn:DEVELOP/INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \
|
||||
develop/info/ini_files.syn:DEVELOP/INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \
|
||||
develop/info/win_const.syn:DEVELOP/INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.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 \
|
||||
@ -146,14 +154,6 @@ FASM_PROGRAMS:=\
|
||||
games/sw:GAMES/SW:$(PROGS)/games/sw/trunk/sw.asm \
|
||||
games/tanks:GAMES/TANKS:$(PROGS)/games/tanks/trunk/tanks.asm \
|
||||
games/tetris:GAMES/TETRIS:$(PROGS)/games/tetris/trunk/tetris.asm \
|
||||
info/asm.syn:INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \
|
||||
info/cpp_kol_cla.syn:INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \
|
||||
info/cpp_kol_dar.syn:INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \
|
||||
info/cpp_kol_def.syn:INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \
|
||||
info/default.syn:INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \
|
||||
info/html.syn:INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \
|
||||
info/ini_files.syn:INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \
|
||||
info/win_const.syn:INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.asm \
|
||||
lib/archiver.obj:LIB/ARCHIVER.OBJ:$(PROGS)/fs/kfar/trunk/kfar_arc/kfar_arc.asm \
|
||||
lib/box_lib.obj:LIB/BOX_LIB.OBJ:$(PROGS)/develop/libraries/box_lib/trunk/box_lib.asm \
|
||||
lib/console.obj:LIB/CONSOLE.OBJ:$(PROGS)/develop/libraries/console/console.asm \
|
||||
@ -202,9 +202,9 @@ COPY_FILES:=\
|
||||
macros.inc:MACROS.INC:$(PROGS)/macros.inc \
|
||||
config.inc:CONFIG.INC:$(PROGS)/config.inc \
|
||||
struct.inc:STRUCT.INC:$(PROGS)/struct.inc \
|
||||
te_icon.png:TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
|
||||
tl_nod_16.png:TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
|
||||
tl_sys_16.png:TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
|
||||
develop/te_icon.png:DEVELOP/TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
|
||||
develop/tl_nod_16.png:DEVELOP/TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
|
||||
develop/tl_sys_16.png:DEVELOP/TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
|
||||
File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \
|
||||
File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/english/kfm_keys.txt \
|
||||
File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \
|
||||
@ -339,11 +339,11 @@ $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::3D
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEMOS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEVELOP
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEVELOP/INFO
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DRIVERS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::File\ Managers
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::FONTS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::GAMES
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::INFO
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::LIB
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::MEDIA
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::NETWORK
|
||||
@ -363,10 +363,11 @@ $(BUILD_DIR)/kolibri.iso: $(BUILD_DIR)/kolibri.img $(mkisofs_extra_targets)
|
||||
$(BUILD_DIR)/boot_fat12.bin: $(KERNEL)/bootloader/boot_fat12.asm $(KERNEL)/bootloader/floppy1440.inc
|
||||
fasm $(KERNEL)/bootloader/boot_fat12.asm $(BUILD_DIR)/boot_fat12.bin
|
||||
|
||||
$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir info/.dir drivers/.dir fonts/.dir \
|
||||
$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir develop/info/.dir drivers/.dir fonts/.dir \
|
||||
games/.dir lib/.dir media/.dir network/.dir .deps/.dir:
|
||||
mkdir -p $(dir $@)
|
||||
touch $@
|
||||
develop/info/.dir: develop/.dir
|
||||
File\ Managers/.dir:
|
||||
mkdir -p "File Managers"
|
||||
touch "File Managers/.dir"
|
||||
|
@ -78,7 +78,6 @@ FASM_PROGRAMS:=\
|
||||
setup:SETUP:$(PROGS)/system/setup/trunk/setup.asm \
|
||||
test:TEST:$(PROGS)/system/test/trunk/test.asm \
|
||||
tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \
|
||||
t_edit:T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \
|
||||
zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \
|
||||
3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \
|
||||
3d/3dsheart:3D/3DSHEART:$(PROGS)/demos/3dsheart/trunk/3dsheart.asm \
|
||||
@ -111,9 +110,18 @@ FASM_PROGRAMS:=\
|
||||
develop/keyascii:DEVELOP/KEYASCII:$(PROGS)/develop/keyascii/trunk/keyascii.asm \
|
||||
develop/mtdbg:DEVELOP/MTDBG:$(PROGS)/develop/mtdbg/mtdbg.asm \
|
||||
develop/scancode:DEVELOP/SCANCODE:$(PROGS)/develop/scancode/trunk/scancode.asm \
|
||||
develop/t_edit:DEVELOP/T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \
|
||||
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 \
|
||||
develop/info/asm.syn:DEVELOP/INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \
|
||||
develop/info/cpp_kol_cla.syn:DEVELOP/INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \
|
||||
develop/info/cpp_kol_dar.syn:DEVELOP/INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \
|
||||
develop/info/cpp_kol_def.syn:DEVELOP/INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \
|
||||
develop/info/default.syn:DEVELOP/INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \
|
||||
develop/info/html.syn:DEVELOP/INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \
|
||||
develop/info/ini_files.syn:DEVELOP/INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \
|
||||
develop/info/win_const.syn:DEVELOP/INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.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 \
|
||||
@ -146,14 +154,6 @@ FASM_PROGRAMS:=\
|
||||
games/sw:GAMES/SW:$(PROGS)/games/sw/trunk/sw.asm \
|
||||
games/tanks:GAMES/TANKS:$(PROGS)/games/tanks/trunk/tanks.asm \
|
||||
games/tetris:GAMES/TETRIS:$(PROGS)/games/tetris/trunk/tetris.asm \
|
||||
info/asm.syn:INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \
|
||||
info/cpp_kol_cla.syn:INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \
|
||||
info/cpp_kol_dar.syn:INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \
|
||||
info/cpp_kol_def.syn:INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \
|
||||
info/default.syn:INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \
|
||||
info/html.syn:INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \
|
||||
info/ini_files.syn:INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \
|
||||
info/win_const.syn:INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.asm \
|
||||
lib/archiver.obj:LIB/ARCHIVER.OBJ:$(PROGS)/fs/kfar/trunk/kfar_arc/kfar_arc.asm \
|
||||
lib/box_lib.obj:LIB/BOX_LIB.OBJ:$(PROGS)/develop/libraries/box_lib/trunk/box_lib.asm \
|
||||
lib/console.obj:LIB/CONSOLE.OBJ:$(PROGS)/develop/libraries/console/console.asm \
|
||||
@ -207,9 +207,9 @@ COPY_FILES:=\
|
||||
macros.inc:MACROS.INC:$(PROGS)/macros.inc \
|
||||
config.inc:CONFIG.INC:$(PROGS)/config.inc \
|
||||
struct.inc:STRUCT.INC:$(PROGS)/struct.inc \
|
||||
te_icon.png:TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
|
||||
tl_nod_16.png:TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
|
||||
tl_sys_16.png:TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
|
||||
develop/te_icon.png:DEVELOP/TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
|
||||
develop/tl_nod_16.png:DEVELOP/TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
|
||||
develop/tl_sys_16.png:DEVELOP/TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
|
||||
File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \
|
||||
File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/english/kfm_keys.txt \
|
||||
File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \
|
||||
@ -350,11 +350,11 @@ $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::3D
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEMOS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEVELOP
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEVELOP/INFO
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DRIVERS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::File\ Managers
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::FONTS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::GAMES
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::INFO
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::LIB
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::MEDIA
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::NETWORK
|
||||
@ -374,10 +374,11 @@ $(BUILD_DIR)/kolibri.iso: $(BUILD_DIR)/kolibri.img $(mkisofs_extra_targets)
|
||||
$(BUILD_DIR)/boot_fat12.bin: $(KERNEL)/bootloader/boot_fat12.asm $(KERNEL)/bootloader/floppy1440.inc
|
||||
fasm $(KERNEL)/bootloader/boot_fat12.asm $(BUILD_DIR)/boot_fat12.bin
|
||||
|
||||
$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir info/.dir drivers/.dir fonts/.dir \
|
||||
$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir develop/info/.dir drivers/.dir fonts/.dir \
|
||||
games/.dir lib/.dir media/.dir network/.dir .deps/.dir:
|
||||
mkdir -p $(dir $@)
|
||||
touch $@
|
||||
develop/info/.dir: develop/.dir
|
||||
File\ Managers/.dir:
|
||||
mkdir -p "File Managers"
|
||||
touch "File Managers/.dir"
|
||||
|
@ -79,7 +79,6 @@ FASM_PROGRAMS:=\
|
||||
setup:SETUP:$(PROGS)/system/setup/trunk/setup.asm \
|
||||
test:TEST:$(PROGS)/system/test/trunk/test.asm \
|
||||
tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \
|
||||
t_edit:T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \
|
||||
zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \
|
||||
develop/board:DEVELOP/BOARD:$(PROGS)/system/board/trunk/board.asm \
|
||||
develop/cObj:DEVELOP/cObj:$(PROGS)/develop/cObj/trunk/cObj.asm \
|
||||
@ -90,6 +89,7 @@ FASM_PROGRAMS:=\
|
||||
develop/keyascii:DEVELOP/KEYASCII:$(PROGS)/develop/keyascii/trunk/keyascii.asm \
|
||||
develop/mtdbg:DEVELOP/MTDBG:$(PROGS)/develop/mtdbg/mtdbg.asm \
|
||||
develop/scancode:DEVELOP/SCANCODE:$(PROGS)/develop/scancode/trunk/scancode.asm \
|
||||
develop/t_edit:DEVELOP/T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \
|
||||
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 \
|
||||
@ -104,14 +104,14 @@ FASM_PROGRAMS:=\
|
||||
File|Managers/kfar:File|Managers/KFAR:$(PROGS)/fs/kfar/trunk/kfar.asm \
|
||||
File|Managers/kfm:File|Managers/KFM:$(PROGS)/fs/kfm/trunk/kfm.asm \
|
||||
File|Managers/opendial:File|Managers/OPENDIAL:$(PROGS)/fs/opendial/opendial.asm \
|
||||
info/asm.syn:INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \
|
||||
info/cpp_kol_cla.syn:INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \
|
||||
info/cpp_kol_dar.syn:INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \
|
||||
info/cpp_kol_def.syn:INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \
|
||||
info/default.syn:INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \
|
||||
info/html.syn:INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \
|
||||
info/ini_files.syn:INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \
|
||||
info/win_const.syn:INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.asm \
|
||||
develop/info/asm.syn:DEVELOP/INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \
|
||||
develop/info/cpp_kol_cla.syn:DEVELOP/INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \
|
||||
develop/info/cpp_kol_dar.syn:DEVELOP/INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \
|
||||
develop/info/cpp_kol_def.syn:DEVELOP/INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \
|
||||
develop/info/default.syn:DEVELOP/INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \
|
||||
develop/info/html.syn:DEVELOP/INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \
|
||||
develop/info/ini_files.syn:DEVELOP/INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \
|
||||
develop/info/win_const.syn:DEVELOP/INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.asm \
|
||||
lib/archiver.obj:LIB/ARCHIVER.OBJ:$(PROGS)/fs/kfar/trunk/kfar_arc/kfar_arc.asm \
|
||||
lib/box_lib.obj:LIB/BOX_LIB.OBJ:$(PROGS)/develop/libraries/box_lib/trunk/box_lib.asm \
|
||||
lib/console.obj:LIB/CONSOLE.OBJ:$(PROGS)/develop/libraries/console/console.asm \
|
||||
@ -155,9 +155,9 @@ COPY_FILES:=\
|
||||
macros.inc:MACROS.INC:$(PROGS)/macros.inc \
|
||||
config.inc:CONFIG.INC:$(PROGS)/config.inc \
|
||||
struct.inc:STRUCT.INC:$(PROGS)/struct.inc \
|
||||
te_icon.png:TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
|
||||
tl_nod_16.png:TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
|
||||
tl_sys_16.png:TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
|
||||
develop/te_icon.png:DEVELOP/TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
|
||||
develop/tl_nod_16.png:DEVELOP/TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
|
||||
develop/tl_sys_16.png:DEVELOP/TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
|
||||
File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \
|
||||
File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/english/kfm_keys.txt \
|
||||
File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \
|
||||
@ -264,10 +264,10 @@ $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \
|
||||
mformat -f 1440 -i $(BUILD_DIR)/kolibri.img ::
|
||||
dd if=$(BUILD_DIR)/boot_fat12.bin of=$(BUILD_DIR)/kolibri.img count=1 bs=512 conv=notrunc 2>&1
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEVELOP
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEVELOP/INFO
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DRIVERS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::File\ Managers
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::FONTS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::INFO
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::LIB
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::MEDIA
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::NETWORK
|
||||
@ -281,10 +281,11 @@ $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \
|
||||
$(BUILD_DIR)/boot_fat12.bin: $(TRUNKKERNEL)/bootloader/boot_fat12.asm $(TRUNKKERNEL)/bootloader/floppy1440.inc
|
||||
fasm $(TRUNKKERNEL)/bootloader/boot_fat12.asm $(BUILD_DIR)/boot_fat12.bin
|
||||
|
||||
$(BUILD_DIR)/.dir develop/.dir info/.dir drivers/.dir fonts/.dir \
|
||||
$(BUILD_DIR)/.dir develop/.dir develop/info/.dir drivers/.dir fonts/.dir \
|
||||
lib/.dir media/.dir network/.dir .deps/.dir:
|
||||
mkdir -p $(dir $@)
|
||||
touch $@
|
||||
develop/info/.dir: develop/.dir
|
||||
File\ Managers/.dir:
|
||||
mkdir -p "File Managers"
|
||||
touch "File Managers/.dir"
|
||||
|
@ -78,7 +78,6 @@ FASM_PROGRAMS:=\
|
||||
setup:SETUP:$(PROGS)/system/setup/trunk/setup.asm \
|
||||
test:TEST:$(PROGS)/system/test/trunk/test.asm \
|
||||
tinypad:TINYPAD:$(PROGS)/develop/tinypad/trunk/tinypad.asm \
|
||||
t_edit:T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \
|
||||
zkey:ZKEY:$(PROGS)/system/zkey/trunk/ZKEY.ASM \
|
||||
3d/3dcube2:3D/3DCUBE2:$(PROGS)/demos/3dcube2/trunk/3DCUBE2.ASM \
|
||||
3d/3dsheart:3D/3DSHEART:$(PROGS)/demos/3dsheart/trunk/3dsheart.asm \
|
||||
@ -111,9 +110,18 @@ FASM_PROGRAMS:=\
|
||||
develop/keyascii:DEVELOP/KEYASCII:$(PROGS)/develop/keyascii/trunk/keyascii.asm \
|
||||
develop/mtdbg:DEVELOP/MTDBG:$(PROGS)/develop/mtdbg/mtdbg.asm \
|
||||
develop/scancode:DEVELOP/SCANCODE:$(PROGS)/develop/scancode/trunk/scancode.asm \
|
||||
develop/t_edit:DEVELOP/T_EDIT:$(PROGS)/other/t_edit/t_edit.asm \
|
||||
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 \
|
||||
develop/info/asm.syn:DEVELOP/INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \
|
||||
develop/info/cpp_kol_cla.syn:DEVELOP/INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \
|
||||
develop/info/cpp_kol_dar.syn:DEVELOP/INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \
|
||||
develop/info/cpp_kol_def.syn:DEVELOP/INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \
|
||||
develop/info/default.syn:DEVELOP/INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \
|
||||
develop/info/html.syn:DEVELOP/INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \
|
||||
develop/info/ini_files.syn:DEVELOP/INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \
|
||||
develop/info/win_const.syn:DEVELOP/INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.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 \
|
||||
@ -145,14 +153,6 @@ FASM_PROGRAMS:=\
|
||||
games/sw:GAMES/SW:$(PROGS)/games/sw/trunk/sw.asm \
|
||||
games/tanks:GAMES/TANKS:$(PROGS)/games/tanks/trunk/tanks.asm \
|
||||
games/tetris:GAMES/TETRIS:$(PROGS)/games/tetris/trunk/tetris.asm \
|
||||
info/asm.syn:INFO/ASM.SYN:$(PROGS)/other/t_edit/info/asm_syn.asm \
|
||||
info/cpp_kol_cla.syn:INFO/CPP_KOL_CLA.SYN:$(PROGS)/other/t_edit/info/cpp_kol_cla_syn.asm \
|
||||
info/cpp_kol_dar.syn:INFO/CPP_KOL_DAR.SYN:$(PROGS)/other/t_edit/info/cpp_kol_dar_syn.asm \
|
||||
info/cpp_kol_def.syn:INFO/CPP_KOL_DEF.SYN:$(PROGS)/other/t_edit/info/cpp_kol_def_syn.asm \
|
||||
info/default.syn:INFO/DEFAULT.SYN:$(PROGS)/other/t_edit/info/default_syn.asm \
|
||||
info/html.syn:INFO/HTML.SYN:$(PROGS)/other/t_edit/info/html_syn.asm \
|
||||
info/ini_files.syn:INFO/INI_FILES.SYN:$(PROGS)/other/t_edit/info/ini_files_syn.asm \
|
||||
info/win_const.syn:INFO/WIN_CONST.SYN:$(PROGS)/other/t_edit/info/win_const_syn.asm \
|
||||
lib/archiver.obj:LIB/ARCHIVER.OBJ:$(PROGS)/fs/kfar/trunk/kfar_arc/kfar_arc.asm \
|
||||
lib/box_lib.obj:LIB/BOX_LIB.OBJ:$(PROGS)/develop/libraries/box_lib/trunk/box_lib.asm \
|
||||
lib/console.obj:LIB/CONSOLE.OBJ:$(PROGS)/develop/libraries/console/console.asm \
|
||||
@ -206,9 +206,9 @@ COPY_FILES:=\
|
||||
macros.inc:MACROS.INC:$(PROGS)/macros.inc \
|
||||
config.inc:CONFIG.INC:$(PROGS)/config.inc \
|
||||
struct.inc:STRUCT.INC:$(PROGS)/struct.inc \
|
||||
te_icon.png:TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
|
||||
tl_nod_16.png:TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
|
||||
tl_sys_16.png:TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
|
||||
develop/te_icon.png:DEVELOP/TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
|
||||
develop/tl_nod_16.png:DEVELOP/TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
|
||||
develop/tl_sys_16.png:DEVELOP/TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
|
||||
File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \
|
||||
File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/russian/dos_kolibri/kfm_keys.txt \
|
||||
File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \
|
||||
@ -344,11 +344,11 @@ $(BUILD_DIR)/kolibri.img: $(BUILD_DIR)/.dir \
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::3D
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEMOS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEVELOP
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DEVELOP/INFO
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::DRIVERS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::File\ Managers
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::FONTS
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::GAMES
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::INFO
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::LIB
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::MEDIA
|
||||
mmd -i $(BUILD_DIR)/kolibri.img ::NETWORK
|
||||
@ -368,10 +368,11 @@ $(BUILD_DIR)/kolibri.iso: $(BUILD_DIR)/kolibri.img $(mkisofs_extra_targets)
|
||||
$(BUILD_DIR)/boot_fat12.bin: $(KERNEL)/bootloader/boot_fat12.asm $(KERNEL)/bootloader/floppy1440.inc
|
||||
fasm $(KERNEL)/bootloader/boot_fat12.asm $(BUILD_DIR)/boot_fat12.bin
|
||||
|
||||
$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir info/.dir drivers/.dir fonts/.dir \
|
||||
$(BUILD_DIR)/.dir 3d/.dir demos/.dir develop/.dir develop/info/.dir drivers/.dir fonts/.dir \
|
||||
games/.dir lib/.dir media/.dir network/.dir .deps/.dir:
|
||||
mkdir -p $(dir $@)
|
||||
touch $@
|
||||
develop/info/.dir: develop/.dir
|
||||
File\ Managers/.dir:
|
||||
mkdir -p "File Managers"
|
||||
touch "File Managers/.dir"
|
||||
|
Loading…
Reference in New Issue
Block a user