diff --git a/data/Tupfile.lua b/data/Tupfile.lua index e3dc4cf3c..f33297172 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -195,8 +195,8 @@ extra_files = { {"kolibrios/develop/utils/SPEDump", SRC_PROGS .. "/develop/SPEDump/SPEDump.kex"}, {"kolibrios/emul/", "common/emul/*"}, {"kolibrios/emul/dosbox/", "common/emul/DosBox/*"}, - {"kolibrios/emul/e80/readme.txt", SRC_PROGS .. "/emulator/e80/trunk/readme.txt"}, - {"kolibrios/emul/e80/keyboard.png", SRC_PROGS .. "/emulator/e80/trunk/keyboard.png"}, + {"kolibrios/emul/e80/readme.txt", SRC_PROGS .. "/emulator/e80/readme.txt"}, + {"kolibrios/emul/e80/keyboard.png", SRC_PROGS .. "/emulator/e80/keyboard.png"}, {"kolibrios/emul/fceu/fceu", SRC_PROGS .. "/emulator/fceu/fceu"}, {"kolibrios/emul/fceu/FCEU ReadMe.txt", SRC_PROGS .. "/emulator/fceu/FCEU ReadMe.txt"}, {"kolibrios/emul/chip8/chip8", VAR_PROGS .. "/emulator/chip8/chip8"}, @@ -284,7 +284,7 @@ extra_files = { {"kolibrios/netsurf/res/", "common/network/netsurf/res/*"}, {"kolibrios/res/skins/", "../skins/authors.txt"}, {"kolibrios/res/templates/", "common/templates/*"}, - {"kolibrios/res/templates/", SRC_PROGS .. "/emulator/e80/trunk/games/*"}, + {"kolibrios/res/templates/", SRC_PROGS .. "/emulator/e80/games/*"}, {"kolibrios/res/templates/NES/", "common/templates/NES/*"}, {"kolibrios/res/wallpapers/", "common/wallpapers/*"}, {"kolibrios/res/system/", build_type .. "/settings/kolibri.lbl"}, @@ -409,7 +409,7 @@ tup.append_table(img_files, { {"HACONFIG", VAR_PROGS .. "/other/ha/HACONFIG"}, {"ACLOCK", VAR_PROGS .. "/demos/aclock/aclock"}, {"APM", VAR_PROGS .. "/system/apm/apm"}, - {"CALC", VAR_PROGS .. "/other/calc/trunk/calc"}, + {"CALC", VAR_PROGS .. "/other/calc/calc"}, {"CALCPLUS", VAR_PROGS .. "/other/calcplus/calcplus"}, {"CALENDAR", VAR_PROGS .. "/system/calendar/calendar"}, {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"}, @@ -435,7 +435,7 @@ tup.append_table(img_files, { {"MYKEY", VAR_PROGS .. "/system/MyKey/MyKey"}, {"PCIDEV", VAR_PROGS .. "/testing/pcidev/trunk/PCIDEV"}, {"RDSAVE", VAR_PROGS .. "/system/rdsave/rdsave"}, - {"RTFREAD", VAR_PROGS .. "/other/rtfread/trunk/rtfread"}, + {"RTFREAD", VAR_PROGS .. "/other/rtfread/rtfread"}, {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"}, {"SCRSHOOT", VAR_PROGS .. "/media/scrshoot/scrshoot"}, {"SETUP", VAR_PROGS .. "/system/setup/trunk/setup"}, @@ -523,10 +523,10 @@ tup.append_table(img_files, { {"LIB/RASTERWORKS.OBJ", VAR_PROGS .. "/develop/libraries/fontRasterWorks_unicode/RasterWorks.obj"}, {"LIB/SORT.OBJ", VAR_PROGS .. "/develop/libraries/sorter/sort.obj"}, {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"}, - {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/trunk/animage"}, + {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/animage"}, {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"}, - {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/trunk/kiv"}, - {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/trunk/listplay"}, + {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/kiv"}, + {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/listplay"}, {"MEDIA/MIDAMP", VAR_PROGS .. "/media/midamp/trunk/midamp"}, {"MEDIA/MP3INFO", VAR_PROGS .. "/media/mp3info/mp3info"}, {"MEDIA/PALITRA", VAR_PROGS .. "/media/palitra/trunk/palitra"}, @@ -641,7 +641,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, { }) end if build_type == "ru_RU" then tup.append_table(extra_files, { - {"kolibrios/utils/period", VAR_PROGS .. "/other/period/trunk/period"}, + {"kolibrios/utils/period", VAR_PROGS .. "/other/period/period"}, {"kolibrios/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"}, }) end @@ -752,7 +752,7 @@ tup.append_table(img_files, { tup.append_table(extra_files, { -- {"kolibrios/3D/cubeline", VAR_PROGS .. "/demos/cubeline/trunk/cubeline"}, {"kolibrios/3D/gears", VAR_PROGS .. "/demos/gears/gears"}, - {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/trunk/e80"}, + {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/e80"}, {"kolibrios/emul/uarm/", VAR_CONTRIB .. "/other/uarm/uARM"}, {"kolibrios/games/2048", VAR_PROGS .. "/games/2048/2048"}, {"kolibrios/games/checkers", VAR_PROGS .. "/games/checkers/checkers"}, diff --git a/programs/build_all.bat b/programs/build_all.bat index 0bb76a127..8b660045f 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -154,16 +154,16 @@ echo * echo Building other echo * rem fasm other\archer\trunk\@rcher.asm %BIN%\@rcher -fasm other\calc\trunk\calc.asm %BIN%\calc +fasm other\calc\calc.asm %BIN%\calc fasm other\mhc\trunk\mhc.asm %BIN%\mhc -fasm other\period\trunk\period.asm %BIN%\period -fasm other\rtfread\trunk\rtfread.asm %BIN%\rtfread +fasm other\period\period.asm %BIN%\period +fasm other\rtfread\rtfread.asm %BIN%\rtfread echo * echo Building media echo * rem media\ac97snd\trunk\ac97snd.asm ac97snd -fasm media\animage\trunk\animage.asm %BIN%\animage +fasm media\animage\animage.asm %BIN%\animage fasm media\cdp\trunk\cdp.asm %BIN%\cdp fasm media\gifview\trunk\gifview.asm %BIN%\gifview fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit @@ -231,9 +231,9 @@ echo * echo Building depend application for fdd's nightbuild echo * echo __nightbuild fix yes >> config.inc -fasm media\kiv\trunk\kiv.asm %BIN%\nightbuild\kiv +fasm media\kiv\kiv.asm %BIN%\nightbuild\kiv fasm media\scrshoot\scrshoot.asm %BIN%\nightbuild\scrshoot -fasm media\animage\trunk\animage.asm %BIN%\nightbuild\animage +fasm media\animage\animage.asm %BIN%\nightbuild\animage fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad @@ -242,7 +242,7 @@ fasm system\hdd_info\hdd_info.asm %BIN%\nightbuild\hdd_info fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb fasm system\rdsave\rdsave.asm %BIN%\nightbuild\rdsave fasm other\kpack\trunk\kpack.asm %BIN%\nightbuild\kpack -fasm other\rtfread\trunk\rtfread.asm %BIN%\nightbuild\rtfread +fasm other\rtfread\rtfread.asm %BIN%\nightbuild\rtfread ;restore echo __CPU_type fix %res% > config.inc erase lang.inc