diff --git a/data/Tupfile.lua b/data/Tupfile.lua index f7ea913841..396b98e04e 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -474,22 +474,22 @@ tup.append_table(img_files, { {"DEVELOP/EXAMPLES/USE_MB", VAR_PROGS .. "/demos/use_mb/use_mb"}, {"File Managers/KFAR", VAR_PROGS .. "/fs/kfar/trunk/kfar"}, {"File Managers/OPENDIAL", VAR_PROGS .. "/fs/opendial/opendial"}, - {"GAMES/15", VAR_PROGS .. "/games/15/trunk/15"}, + {"GAMES/15", VAR_PROGS .. "/games/15/15"}, {"GAMES/DINO", VAR_PROGS .. "/games/dino/dino"}, {"GAMES/FREECELL", VAR_PROGS .. "/games/freecell/freecell"}, - {"GAMES/GOMOKU", VAR_PROGS .. "/games/gomoku/trunk/gomoku"}, - {"GAMES/LIGHTS", VAR_PROGS .. "/games/sq_game/trunk/SQ_GAME"}, + {"GAMES/GOMOKU", VAR_PROGS .. "/games/gomoku/gomoku"}, + {"GAMES/LIGHTS", VAR_PROGS .. "/games/sq_game/SQ_GAME"}, {"GAMES/LINES", VAR_PROGS .. "/games/lines/lines"}, - {"GAMES/MSQUARE", VAR_PROGS .. "/games/MSquare/trunk/MSquare"}, + {"GAMES/MSQUARE", VAR_PROGS .. "/games/MSquare/MSquare"}, {"GAMES/PIPES", VAR_PROGS .. "/games/pipes/pipes"}, - {"GAMES/PONG", VAR_PROGS .. "/games/pong/trunk/pong"}, - {"GAMES/PONG3", VAR_PROGS .. "/games/pong3/trunk/pong3"}, - {"GAMES/RSQUARE", VAR_PROGS .. "/games/rsquare/trunk/rsquare"}, - {"GAMES/SNAKE", VAR_PROGS .. "/games/snake/trunk/snake"}, - {"GAMES/SUDOKU", VAR_PROGS .. "/games/sudoku/trunk/sudoku"}, - {"GAMES/SW", VAR_PROGS .. "/games/sw/trunk/sw"}, - {"GAMES/TANKS", VAR_PROGS .. "/games/tanks/trunk/tanks"}, - {"GAMES/TETRIS", VAR_PROGS .. "/games/tetris/trunk/tetris"}, + {"GAMES/PONG", VAR_PROGS .. "/games/pong/pong"}, + {"GAMES/PONG3", VAR_PROGS .. "/games/pong3/pong3"}, + {"GAMES/RSQUARE", VAR_PROGS .. "/games/rsquare/rsquare"}, + {"GAMES/SNAKE", VAR_PROGS .. "/games/snake/snake"}, + {"GAMES/SUDOKU", VAR_PROGS .. "/games/sudoku/sudoku"}, + {"GAMES/SW", VAR_PROGS .. "/games/sw/sw"}, + {"GAMES/TANKS", VAR_PROGS .. "/games/tanks/tanks"}, + {"GAMES/TETRIS", VAR_PROGS .. "/games/tetris/tetris"}, {"LIB/ARCHIVER.OBJ", VAR_PROGS .. "/fs/kfar/trunk/kfar_arc/kfar_arc.obj"}, {"LIB/BOX_LIB.OBJ", VAR_PROGS .. "/develop/libraries/box_lib/trunk/box_lib.obj"}, {"LIB/BUF2D.OBJ", VAR_PROGS .. "/develop/libraries/buf2d/trunk/buf2d.obj"}, @@ -588,21 +588,21 @@ tup.append_table(extra_files, { {"kolibrios/3D/voxel_utilites/VOX_CREATOR" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_creator"}, {"kolibrios/3D/voxel_utilites/VOX_MOVER" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_mover"}, {"kolibrios/3D/voxel_utilites/VOX_TGL" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_tgl"}, - {"kolibrios/demos/life3", VAR_PROGS .. "/games/life3/trunk/life3"}, + {"kolibrios/demos/life3", VAR_PROGS .. "/games/life3/life3"}, {"kolibrios/demos/qjulia", VAR_PROGS .. "/demos/qjulia/trunk/qjulia"}, {"kolibrios/develop/utils/koldbg", VAR_PROGS .. "/develop/koldbg/koldbg"}, {"kolibrios/develop/utils/charset_checker", VAR_PROGS .. "/other/charset_checker/charchck"}, {"kolibrios/games/Almaz", VAR_PROGS .. "/games/almaz/almaz"}, - {"kolibrios/games/arcanii", VAR_PROGS .. "/games/arcanii/trunk/arcanii"}, + {"kolibrios/games/arcanii", VAR_PROGS .. "/games/arcanii/arcanii"}, {"kolibrios/games/bomber/bomber", VAR_PROGS .. "/games/bomber/bomber"}, {"kolibrios/games/bomber/bomberdata.bin", VAR_PROGS .. "/games/bomber/sounds/bomberdata.bin"}, {"kolibrios/games/codemaster/binary_master", VAR_PROGS .. "/games/codemaster/binary_master"}, {"kolibrios/games/codemaster/hang_programmer", VAR_PROGS .. "/games/codemaster/hang_programmer"}, {"kolibrios/games/codemaster/kolibri_puzzle", VAR_PROGS .. "/games/codemaster/kolibri_puzzle"}, - {"kolibrios/games/megamaze", VAR_PROGS .. "/games/megamaze/trunk/megamaze"}, + {"kolibrios/games/megamaze", VAR_PROGS .. "/games/megamaze/megamaze"}, {"kolibrios/games/invaders", VAR_PROGS .. "/games/invaders/invaders"}, - {"kolibrios/games/phenix", VAR_PROGS .. "/games/phenix/trunk/phenix"}, - {"kolibrios/games/soko/soko", VAR_PROGS .. "/games/soko/trunk/SOKO"}, + {"kolibrios/games/phenix", VAR_PROGS .. "/games/phenix/phenix"}, + {"kolibrios/games/soko/soko", VAR_PROGS .. "/games/soko/SOKO"}, {"kolibrios/media/img_transform", VAR_PROGS .. "/media/img_transform/img_transform"}, {"kolibrios/media/zsea/zsea", VAR_PROGS .. "/media/zsea/zSea"}, {"kolibrios/media/zsea/plugins/cnv_bmp.obj", VAR_PROGS .. "/media/zsea/plugins/bmp/cnv_bmp.obj"}, @@ -619,7 +619,7 @@ tup.append_table(extra_files, { -- For russian build, add russian-only programs. if build_type == "ru_RU" then tup.append_table(img_files, { {"PERIOD", VAR_PROGS .. "/other/period/trunk/period"}, - {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/trunk/klavisha"}, + {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/klavisha"}, {"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"}, }) else tup.append_table(img_files, { {"DEVELOP/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"}, @@ -640,7 +640,7 @@ tup.append_table(img_files, { {"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"}, {"DEVELOP/MSTATE", VAR_PROGS .. "/develop/mstate/mstate"}, {"DEVELOP/GENFILES", VAR_PROGS .. "/testing/genfiles/GenFiles"}, - {"GAMES/C4", VAR_PROGS .. "/games/c4/trunk/c4"}, + {"GAMES/C4", VAR_PROGS .. "/games/c4/c4"}, {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"}, }) tup.append_table(extra_files, { @@ -677,11 +677,11 @@ tup.append_table(img_files, { {"File Managers/KFM2", VAR_PROGS .. "/cmm/misc/kfm2.com"}, {"KF_VIEW", VAR_PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, {"DEVELOP/DIFF", VAR_PROGS .. "/cmm/diff/diff.com"}, - {"GAMES/CLICKS", VAR_PROGS .. "/games/clicks/trunk/clicks.com"}, + {"GAMES/CLICKS", VAR_PROGS .. "/games/clicks/clicks.com"}, {"GAMES/MBLOCKS", VAR_PROGS .. "/cmm/misc/mblocks.com"}, - {"GAMES/FLOOD-IT", VAR_PROGS .. "/games/flood-it/trunk/flood-it.com"}, - {"GAMES/MINE", VAR_PROGS .. "/games/mine/trunk/mine"}, - {"GAMES/NUMBERS", VAR_PROGS .. "/games/FindNumbers/trunk/FindNumbers"}, + {"GAMES/FLOOD-IT", VAR_PROGS .. "/games/flood-it/flood-it.com"}, + {"GAMES/MINE", VAR_PROGS .. "/games/mine/mine"}, + {"GAMES/NUMBERS", VAR_PROGS .. "/games/FindNumbers/FindNumbers"}, {"MEDIA/PIXIE", VAR_PROGS .. "/cmm/pixie2/pixie.com"}, {"MEDIA/ICONEDIT", VAR_PROGS .. "/cmm/iconedit/iconedit.com"}, {"NETWORK/DL", VAR_PROGS .. "/cmm/downloader/dl.com"}, @@ -708,12 +708,12 @@ tup.append_table(img_files, { {"TABLE", VAR_PROGS .. "/other/table/table"}, {"MEDIA/AC97SND", VAR_PROGS .. "/media/ac97snd/ac97snd.bin"}, {"GAMES/KOSILKA", VAR_PROGS .. "/games/kosilka/kosilka"}, - {"GAMES/RFORCES", VAR_PROGS .. "/games/rforces/trunk/rforces"}, - {"GAMES/XONIX", VAR_PROGS .. "/games/xonix/trunk/xonix"}, + {"GAMES/RFORCES", VAR_PROGS .. "/games/rforces/rforces"}, + {"GAMES/XONIX", VAR_PROGS .. "/games/xonix/xonix"}, }) tup.append_table(extra_files, { - {"kolibrios/games/fara/fara", VAR_PROGS .. "/games/fara/trunk/fara"}, - {"kolibrios/games/LaserTank/LaserTank", VAR_PROGS .. "/games/LaserTank/trunk/LaserTank"}, + {"kolibrios/games/fara/fara", VAR_PROGS .. "/games/fara/fara"}, + {"kolibrios/games/LaserTank/LaserTank", VAR_PROGS .. "/games/LaserTank/LaserTank"}, }) end -- tup.getconfig('NO_MSVC') ~= 'full' @@ -743,7 +743,7 @@ end -- tup.getconfig('NO_TCC') ~= 'full' -- Programs that require GCC to compile. if tup.getconfig('NO_GCC') ~= 'full' then tup.append_table(img_files, { - {"GAMES/REVERSI", VAR_PROGS .. "/games/reversi/trunk/reversi"}, + {"GAMES/REVERSI", VAR_PROGS .. "/games/reversi/reversi"}, {"LIB/BASE64.OBJ", VAR_PROGS .. "/develop/libraries/base64/base64.obj"}, {"LIB/LIBC.OBJ", VAR_PROGS .. "/develop/ktcc/trunk/libc.obj/source/libc.obj"}, {"LIB/ICONV.OBJ", VAR_PROGS .. "/develop/libraries/iconv/iconv.obj"}, @@ -755,7 +755,7 @@ tup.append_table(extra_files, { {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/trunk/e80"}, {"kolibrios/emul/uarm/", VAR_CONTRIB .. "/other/uarm/uARM"}, {"kolibrios/games/2048", VAR_PROGS .. "/games/2048/2048"}, - {"kolibrios/games/checkers", VAR_PROGS .. "/games/checkers/trunk/checkers"}, + {"kolibrios/games/checkers", VAR_PROGS .. "/games/checkers/checkers"}, {"kolibrios/games/donkey", VAR_PROGS .. "/games/donkey/donkey"}, {"kolibrios/games/heliothryx", VAR_PROGS .. "/games/heliothryx/heliothryx"}, {"kolibrios/games/marblematch3", VAR_PROGS .. "/games/marblematch3/marblematch3"}, diff --git a/programs/games/15/trunk/15.ASM b/programs/games/15/15.ASM similarity index 99% rename from programs/games/15/trunk/15.ASM rename to programs/games/15/15.ASM index 0866c87897..80891d037a 100644 --- a/programs/games/15/trunk/15.ASM +++ b/programs/games/15/15.ASM @@ -5,7 +5,7 @@ ; include 'lang.inc' ; Language support for locales: ru_RU (CP866), it_IT, de_DE, en_US. -include '..\..\..\macros.inc' ; decreases program size (not required) +include '..\..\macros.inc' ; decreases program size (not required) StatusColor equ 0x00ffffff StatusColor2 equ 0x00dc1e14 diff --git a/programs/games/15/trunk/Tupfile.lua b/programs/games/15/Tupfile.lua similarity index 79% rename from programs/games/15/trunk/Tupfile.lua rename to programs/games/15/Tupfile.lua index 49da15d216..578c0d9e76 100644 --- a/programs/games/15/trunk/Tupfile.lua +++ b/programs/games/15/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/15/trunk/build_en.bat b/programs/games/15/build_en.bat similarity index 100% rename from programs/games/15/trunk/build_en.bat rename to programs/games/15/build_en.bat diff --git a/programs/games/15/trunk/build_ru.bat b/programs/games/15/build_ru.bat similarity index 100% rename from programs/games/15/trunk/build_ru.bat rename to programs/games/15/build_ru.bat diff --git a/programs/games/15/trunk/makefile b/programs/games/15/makefile similarity index 100% rename from programs/games/15/trunk/makefile rename to programs/games/15/makefile diff --git a/programs/games/FindNumbers/trunk/FindNumbers.c-- b/programs/games/FindNumbers/FindNumbers.c-- similarity index 100% rename from programs/games/FindNumbers/trunk/FindNumbers.c-- rename to programs/games/FindNumbers/FindNumbers.c-- diff --git a/programs/games/FindNumbers/trunk/Tupfile.lua b/programs/games/FindNumbers/Tupfile.lua similarity index 100% rename from programs/games/FindNumbers/trunk/Tupfile.lua rename to programs/games/FindNumbers/Tupfile.lua diff --git a/programs/games/FindNumbers/trunk/compile_en.bat b/programs/games/FindNumbers/compile_en.bat similarity index 100% rename from programs/games/FindNumbers/trunk/compile_en.bat rename to programs/games/FindNumbers/compile_en.bat diff --git a/programs/games/FindNumbers/trunk/compile_ru.bat b/programs/games/FindNumbers/compile_ru.bat similarity index 100% rename from programs/games/FindNumbers/trunk/compile_ru.bat rename to programs/games/FindNumbers/compile_ru.bat diff --git a/programs/games/FindNumbers/trunk/kolibri.h-- b/programs/games/FindNumbers/kolibri.h-- similarity index 100% rename from programs/games/FindNumbers/trunk/kolibri.h-- rename to programs/games/FindNumbers/kolibri.h-- diff --git a/programs/games/FindNumbers/trunk/readme.txt b/programs/games/FindNumbers/readme.txt similarity index 100% rename from programs/games/FindNumbers/trunk/readme.txt rename to programs/games/FindNumbers/readme.txt diff --git a/programs/games/LaserTank/trunk/LaserTank.cpp b/programs/games/LaserTank/LaserTank.cpp similarity index 100% rename from programs/games/LaserTank/trunk/LaserTank.cpp rename to programs/games/LaserTank/LaserTank.cpp diff --git a/programs/games/LaserTank/trunk/LaserTank.sdf b/programs/games/LaserTank/LaserTank.sdf similarity index 100% rename from programs/games/LaserTank/trunk/LaserTank.sdf rename to programs/games/LaserTank/LaserTank.sdf diff --git a/programs/games/LaserTank/trunk/LaserTank.sln b/programs/games/LaserTank/LaserTank.sln similarity index 100% rename from programs/games/LaserTank/trunk/LaserTank.sln rename to programs/games/LaserTank/LaserTank.sln diff --git a/programs/games/LaserTank/trunk/LaserTank.vcxproj b/programs/games/LaserTank/LaserTank.vcxproj similarity index 100% rename from programs/games/LaserTank/trunk/LaserTank.vcxproj rename to programs/games/LaserTank/LaserTank.vcxproj diff --git a/programs/games/LaserTank/trunk/LaserTank.vcxproj.filters b/programs/games/LaserTank/LaserTank.vcxproj.filters similarity index 100% rename from programs/games/LaserTank/trunk/LaserTank.vcxproj.filters rename to programs/games/LaserTank/LaserTank.vcxproj.filters diff --git a/programs/games/LaserTank/trunk/Tupfile.lua b/programs/games/LaserTank/Tupfile.lua similarity index 87% rename from programs/games/LaserTank/trunk/Tupfile.lua rename to programs/games/LaserTank/Tupfile.lua index 7db0c33cd3..c862515fe6 100644 --- a/programs/games/LaserTank/trunk/Tupfile.lua +++ b/programs/games/LaserTank/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_MSVC") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_msvc.lua") if tup.getconfig("LANG") == "ru_RU" then CFLAGS = CFLAGS .. " /DLANG=RUS" diff --git a/programs/games/LaserTank/trunk/image.cpp b/programs/games/LaserTank/image.cpp similarity index 100% rename from programs/games/LaserTank/trunk/image.cpp rename to programs/games/LaserTank/image.cpp diff --git a/programs/games/LaserTank/trunk/image.h b/programs/games/LaserTank/image.h similarity index 100% rename from programs/games/LaserTank/trunk/image.h rename to programs/games/LaserTank/image.h diff --git a/programs/games/LaserTank/trunk/levels.lvl b/programs/games/LaserTank/levels.lvl similarity index 100% rename from programs/games/LaserTank/trunk/levels.lvl rename to programs/games/LaserTank/levels.lvl diff --git a/programs/games/LaserTank/trunk/memcmp.asm b/programs/games/LaserTank/memcmp.asm similarity index 100% rename from programs/games/LaserTank/trunk/memcmp.asm rename to programs/games/LaserTank/memcmp.asm diff --git a/programs/games/LaserTank/trunk/render.cpp b/programs/games/LaserTank/render.cpp similarity index 100% rename from programs/games/LaserTank/trunk/render.cpp rename to programs/games/LaserTank/render.cpp diff --git a/programs/games/LaserTank/trunk/render.h b/programs/games/LaserTank/render.h similarity index 100% rename from programs/games/LaserTank/trunk/render.h rename to programs/games/LaserTank/render.h diff --git a/programs/games/LaserTank/trunk/smalllibc/func.cpp b/programs/games/LaserTank/smalllibc/func.cpp similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/func.cpp rename to programs/games/LaserTank/smalllibc/func.cpp diff --git a/programs/games/LaserTank/trunk/smalllibc/func.h b/programs/games/LaserTank/smalllibc/func.h similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/func.h rename to programs/games/LaserTank/smalllibc/func.h diff --git a/programs/games/LaserTank/trunk/smalllibc/init.asm b/programs/games/LaserTank/smalllibc/init.asm similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/init.asm rename to programs/games/LaserTank/smalllibc/init.asm diff --git a/programs/games/LaserTank/trunk/smalllibc/init.obj b/programs/games/LaserTank/smalllibc/init.obj similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/init.obj rename to programs/games/LaserTank/smalllibc/init.obj diff --git a/programs/games/LaserTank/trunk/smalllibc/kosFile.cpp b/programs/games/LaserTank/smalllibc/kosFile.cpp similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/kosFile.cpp rename to programs/games/LaserTank/smalllibc/kosFile.cpp diff --git a/programs/games/LaserTank/trunk/smalllibc/kosFile.h b/programs/games/LaserTank/smalllibc/kosFile.h similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/kosFile.h rename to programs/games/LaserTank/smalllibc/kosFile.h diff --git a/programs/games/LaserTank/trunk/smalllibc/kosSyst.cpp b/programs/games/LaserTank/smalllibc/kosSyst.cpp similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/kosSyst.cpp rename to programs/games/LaserTank/smalllibc/kosSyst.cpp diff --git a/programs/games/LaserTank/trunk/smalllibc/kosSyst.h b/programs/games/LaserTank/smalllibc/kosSyst.h similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/kosSyst.h rename to programs/games/LaserTank/smalllibc/kosSyst.h diff --git a/programs/games/LaserTank/trunk/smalllibc/math2.cpp b/programs/games/LaserTank/smalllibc/math2.cpp similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/math2.cpp rename to programs/games/LaserTank/smalllibc/math2.cpp diff --git a/programs/games/LaserTank/trunk/smalllibc/mcsmemm.cpp b/programs/games/LaserTank/smalllibc/mcsmemm.cpp similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/mcsmemm.cpp rename to programs/games/LaserTank/smalllibc/mcsmemm.cpp diff --git a/programs/games/LaserTank/trunk/smalllibc/mcsmemm.h b/programs/games/LaserTank/smalllibc/mcsmemm.h similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/mcsmemm.h rename to programs/games/LaserTank/smalllibc/mcsmemm.h diff --git a/programs/games/LaserTank/trunk/smalllibc/mymath.h b/programs/games/LaserTank/smalllibc/mymath.h similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/mymath.h rename to programs/games/LaserTank/smalllibc/mymath.h diff --git a/programs/games/LaserTank/trunk/smalllibc/smalllibc.vcxproj b/programs/games/LaserTank/smalllibc/smalllibc.vcxproj similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/smalllibc.vcxproj rename to programs/games/LaserTank/smalllibc/smalllibc.vcxproj diff --git a/programs/games/LaserTank/trunk/smalllibc/smalllibc.vcxproj.filters b/programs/games/LaserTank/smalllibc/smalllibc.vcxproj.filters similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/smalllibc.vcxproj.filters rename to programs/games/LaserTank/smalllibc/smalllibc.vcxproj.filters diff --git a/programs/games/LaserTank/trunk/smalllibc/sprintf.cpp b/programs/games/LaserTank/smalllibc/sprintf.cpp similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/sprintf.cpp rename to programs/games/LaserTank/smalllibc/sprintf.cpp diff --git a/programs/games/LaserTank/trunk/smalllibc/sprintf.h b/programs/games/LaserTank/smalllibc/sprintf.h similarity index 100% rename from programs/games/LaserTank/trunk/smalllibc/sprintf.h rename to programs/games/LaserTank/smalllibc/sprintf.h diff --git a/programs/games/MSquare/trunk/MSquare.asm b/programs/games/MSquare/MSquare.asm similarity index 93% rename from programs/games/MSquare/trunk/MSquare.asm rename to programs/games/MSquare/MSquare.asm index 7462d08e19..7dada521af 100644 --- a/programs/games/MSquare/trunk/MSquare.asm +++ b/programs/games/MSquare/MSquare.asm @@ -45,7 +45,7 @@ debug_print_dec num popad } -include '../../../macros.inc' +include '../../macros.inc' ;include 'debug.inc' include 'editbox_ex.mac' include 'lang.inc' diff --git a/programs/games/MSquare/trunk/MSquare.fnt b/programs/games/MSquare/MSquare.fnt similarity index 100% rename from programs/games/MSquare/trunk/MSquare.fnt rename to programs/games/MSquare/MSquare.fnt diff --git a/programs/games/MSquare/trunk/Tupfile.lua b/programs/games/MSquare/Tupfile.lua similarity index 79% rename from programs/games/MSquare/trunk/Tupfile.lua rename to programs/games/MSquare/Tupfile.lua index 9bf59d5167..05ab5b4d18 100644 --- a/programs/games/MSquare/trunk/Tupfile.lua +++ b/programs/games/MSquare/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/MSquare/trunk/build_en.bat b/programs/games/MSquare/build_en.bat similarity index 100% rename from programs/games/MSquare/trunk/build_en.bat rename to programs/games/MSquare/build_en.bat diff --git a/programs/games/MSquare/trunk/build_ru.bat b/programs/games/MSquare/build_ru.bat similarity index 100% rename from programs/games/MSquare/trunk/build_ru.bat rename to programs/games/MSquare/build_ru.bat diff --git a/programs/games/MSquare/trunk/editbox_ex.mac b/programs/games/MSquare/editbox_ex.mac similarity index 100% rename from programs/games/MSquare/trunk/editbox_ex.mac rename to programs/games/MSquare/editbox_ex.mac diff --git a/programs/games/arcanii/trunk/Tupfile.lua b/programs/games/arcanii/Tupfile.lua similarity index 79% rename from programs/games/arcanii/trunk/Tupfile.lua rename to programs/games/arcanii/Tupfile.lua index 3d1f3f59fe..0f9d7dd688 100644 --- a/programs/games/arcanii/trunk/Tupfile.lua +++ b/programs/games/arcanii/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/arcanii/trunk/arcanii.asm b/programs/games/arcanii/arcanii.asm similarity index 99% rename from programs/games/arcanii/trunk/arcanii.asm rename to programs/games/arcanii/arcanii.asm index 8fb22c59fe..6840570006 100644 --- a/programs/games/arcanii/trunk/arcanii.asm +++ b/programs/games/arcanii/arcanii.asm @@ -5,7 +5,7 @@ ;---------------------------------------- include 'lang.inc' ; Language support for locales: it_IT, en_US. -include '../../../macros.inc' +include '../../macros.inc' include 'ascl.inc' include 'ascgl.inc' include 'asjc.inc' diff --git a/programs/games/arcanii/trunk/arcanii.bmp b/programs/games/arcanii/arcanii.bmp similarity index 100% rename from programs/games/arcanii/trunk/arcanii.bmp rename to programs/games/arcanii/arcanii.bmp diff --git a/programs/games/arcanii/trunk/arcanii_blackbg.bmp b/programs/games/arcanii/arcanii_blackbg.bmp similarity index 100% rename from programs/games/arcanii/trunk/arcanii_blackbg.bmp rename to programs/games/arcanii/arcanii_blackbg.bmp diff --git a/programs/games/arcanii/trunk/ascgl.inc b/programs/games/arcanii/ascgl.inc similarity index 100% rename from programs/games/arcanii/trunk/ascgl.inc rename to programs/games/arcanii/ascgl.inc diff --git a/programs/games/arcanii/trunk/ascl.inc b/programs/games/arcanii/ascl.inc similarity index 100% rename from programs/games/arcanii/trunk/ascl.inc rename to programs/games/arcanii/ascl.inc diff --git a/programs/games/arcanii/trunk/asjc.inc b/programs/games/arcanii/asjc.inc similarity index 100% rename from programs/games/arcanii/trunk/asjc.inc rename to programs/games/arcanii/asjc.inc diff --git a/programs/games/arcanii/trunk/build.bat b/programs/games/arcanii/build.bat similarity index 100% rename from programs/games/arcanii/trunk/build.bat rename to programs/games/arcanii/build.bat diff --git a/programs/games/arcanii/trunk/build_en.bat b/programs/games/arcanii/build_en.bat similarity index 100% rename from programs/games/arcanii/trunk/build_en.bat rename to programs/games/arcanii/build_en.bat diff --git a/programs/games/arcanii/trunk/build_ru.bat b/programs/games/arcanii/build_ru.bat similarity index 100% rename from programs/games/arcanii/trunk/build_ru.bat rename to programs/games/arcanii/build_ru.bat diff --git a/programs/games/arcanii/trunk/makefile b/programs/games/arcanii/makefile similarity index 100% rename from programs/games/arcanii/trunk/makefile rename to programs/games/arcanii/makefile diff --git a/programs/games/arcanoid/trunk/Tupfile.lua b/programs/games/arcanoid/Tupfile.lua similarity index 79% rename from programs/games/arcanoid/trunk/Tupfile.lua rename to programs/games/arcanoid/Tupfile.lua index febbe91d39..dda550f802 100644 --- a/programs/games/arcanoid/trunk/Tupfile.lua +++ b/programs/games/arcanoid/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/arcanoid/trunk/arc.bmp b/programs/games/arcanoid/arc.bmp similarity index 100% rename from programs/games/arcanoid/trunk/arc.bmp rename to programs/games/arcanoid/arc.bmp diff --git a/programs/games/arcanoid/trunk/arcanoid.asm b/programs/games/arcanoid/arcanoid.asm similarity index 99% rename from programs/games/arcanoid/trunk/arcanoid.asm rename to programs/games/arcanoid/arcanoid.asm index 784d7e4ccf..ceced634dd 100644 --- a/programs/games/arcanoid/trunk/arcanoid.asm +++ b/programs/games/arcanoid/arcanoid.asm @@ -20,7 +20,7 @@ ;****************************************************************************** include 'lang.inc' ; Language support for locales: it_IT, en_US. -include '..\..\..\macros.inc' +include '..\..\macros.inc' include 'ascl.inc' include 'ascgl.inc' include 'ascgml.inc' diff --git a/programs/games/arcanoid/trunk/ascgl.inc b/programs/games/arcanoid/ascgl.inc similarity index 100% rename from programs/games/arcanoid/trunk/ascgl.inc rename to programs/games/arcanoid/ascgl.inc diff --git a/programs/games/arcanoid/trunk/ascgml.inc b/programs/games/arcanoid/ascgml.inc similarity index 100% rename from programs/games/arcanoid/trunk/ascgml.inc rename to programs/games/arcanoid/ascgml.inc diff --git a/programs/games/arcanoid/trunk/ascl.inc b/programs/games/arcanoid/ascl.inc similarity index 100% rename from programs/games/arcanoid/trunk/ascl.inc rename to programs/games/arcanoid/ascl.inc diff --git a/programs/games/arcanoid/trunk/build_en.bat b/programs/games/arcanoid/build_en.bat similarity index 100% rename from programs/games/arcanoid/trunk/build_en.bat rename to programs/games/arcanoid/build_en.bat diff --git a/programs/games/arcanoid/trunk/build_ru.bat b/programs/games/arcanoid/build_ru.bat similarity index 100% rename from programs/games/arcanoid/trunk/build_ru.bat rename to programs/games/arcanoid/build_ru.bat diff --git a/programs/games/arcanoid/trunk/makefile b/programs/games/arcanoid/makefile similarity index 100% rename from programs/games/arcanoid/trunk/makefile rename to programs/games/arcanoid/makefile diff --git a/programs/games/bnc/trunk/Tupfile.lua b/programs/games/bnc/Tupfile.lua similarity index 69% rename from programs/games/bnc/trunk/Tupfile.lua rename to programs/games/bnc/Tupfile.lua index c6e010e113..5346ae9c37 100644 --- a/programs/games/bnc/trunk/Tupfile.lua +++ b/programs/games/bnc/Tupfile.lua @@ -1,4 +1,4 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") tup.rule("bnc.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bnc") diff --git a/programs/games/bnc/trunk/bk100.png b/programs/games/bnc/bk100.png similarity index 100% rename from programs/games/bnc/trunk/bk100.png rename to programs/games/bnc/bk100.png diff --git a/programs/games/bnc/trunk/bk5.PNG b/programs/games/bnc/bk5.PNG similarity index 100% rename from programs/games/bnc/trunk/bk5.PNG rename to programs/games/bnc/bk5.PNG diff --git a/programs/games/bnc/trunk/bnc.asm b/programs/games/bnc/bnc.asm similarity index 100% rename from programs/games/bnc/trunk/bnc.asm rename to programs/games/bnc/bnc.asm diff --git a/programs/games/bnc/trunk/bnc.txt b/programs/games/bnc/bnc.txt similarity index 100% rename from programs/games/bnc/trunk/bnc.txt rename to programs/games/bnc/bnc.txt diff --git a/programs/games/bnc/trunk/bnc4.PNG b/programs/games/bnc/bnc4.PNG similarity index 100% rename from programs/games/bnc/trunk/bnc4.PNG rename to programs/games/bnc/bnc4.PNG diff --git a/programs/games/bnc/trunk/bnc6.PNG b/programs/games/bnc/bnc6.PNG similarity index 100% rename from programs/games/bnc/trunk/bnc6.PNG rename to programs/games/bnc/bnc6.PNG diff --git a/programs/games/bnc/trunk/code.inc b/programs/games/bnc/code.inc similarity index 100% rename from programs/games/bnc/trunk/code.inc rename to programs/games/bnc/code.inc diff --git a/programs/games/bnc/trunk/data.inc b/programs/games/bnc/data.inc similarity index 100% rename from programs/games/bnc/trunk/data.inc rename to programs/games/bnc/data.inc diff --git a/programs/games/bnc/trunk/draw.inc b/programs/games/bnc/draw.inc similarity index 100% rename from programs/games/bnc/trunk/draw.inc rename to programs/games/bnc/draw.inc diff --git a/programs/games/bnc/trunk/macs.inc b/programs/games/bnc/macs.inc similarity index 100% rename from programs/games/bnc/trunk/macs.inc rename to programs/games/bnc/macs.inc diff --git a/programs/games/bnc/trunk/main.inc b/programs/games/bnc/main.inc similarity index 100% rename from programs/games/bnc/trunk/main.inc rename to programs/games/bnc/main.inc diff --git a/programs/games/bnc/trunk/makefile b/programs/games/bnc/makefile similarity index 100% rename from programs/games/bnc/trunk/makefile rename to programs/games/bnc/makefile diff --git a/programs/games/c4/trunk/Readme.txt b/programs/games/c4/Readme.txt similarity index 100% rename from programs/games/c4/trunk/Readme.txt rename to programs/games/c4/Readme.txt diff --git a/programs/games/c4/trunk/Tupfile.lua b/programs/games/c4/Tupfile.lua similarity index 100% rename from programs/games/c4/trunk/Tupfile.lua rename to programs/games/c4/Tupfile.lua diff --git a/programs/games/c4/trunk/ai.inc b/programs/games/c4/ai.inc similarity index 100% rename from programs/games/c4/trunk/ai.inc rename to programs/games/c4/ai.inc diff --git a/programs/games/c4/trunk/blue.pcx b/programs/games/c4/blue.pcx similarity index 100% rename from programs/games/c4/trunk/blue.pcx rename to programs/games/c4/blue.pcx diff --git a/programs/games/c4/trunk/board.inc b/programs/games/c4/board.inc similarity index 100% rename from programs/games/c4/trunk/board.inc rename to programs/games/c4/board.inc diff --git a/programs/games/c4/trunk/build.bat b/programs/games/c4/build.bat similarity index 100% rename from programs/games/c4/trunk/build.bat rename to programs/games/c4/build.bat diff --git a/programs/games/c4/trunk/c4.asm b/programs/games/c4/c4.asm similarity index 100% rename from programs/games/c4/trunk/c4.asm rename to programs/games/c4/c4.asm diff --git a/programs/games/c4/trunk/makefile b/programs/games/c4/makefile similarity index 100% rename from programs/games/c4/trunk/makefile rename to programs/games/c4/makefile diff --git a/programs/games/c4/trunk/mos.inc b/programs/games/c4/mos.inc similarity index 100% rename from programs/games/c4/trunk/mos.inc rename to programs/games/c4/mos.inc diff --git a/programs/games/c4/trunk/pcx.inc b/programs/games/c4/pcx.inc similarity index 100% rename from programs/games/c4/trunk/pcx.inc rename to programs/games/c4/pcx.inc diff --git a/programs/games/c4/trunk/randomai.inc b/programs/games/c4/randomai.inc similarity index 100% rename from programs/games/c4/trunk/randomai.inc rename to programs/games/c4/randomai.inc diff --git a/programs/games/c4/trunk/red.pcx b/programs/games/c4/red.pcx similarity index 100% rename from programs/games/c4/trunk/red.pcx rename to programs/games/c4/red.pcx diff --git a/programs/games/c4/trunk/rng.inc b/programs/games/c4/rng.inc similarity index 100% rename from programs/games/c4/trunk/rng.inc rename to programs/games/c4/rng.inc diff --git a/programs/games/c4/trunk/windows.inc b/programs/games/c4/windows.inc similarity index 100% rename from programs/games/c4/trunk/windows.inc rename to programs/games/c4/windows.inc diff --git a/programs/games/checkers/trunk/Tupfile.lua b/programs/games/checkers/Tupfile.lua similarity index 82% rename from programs/games/checkers/trunk/Tupfile.lua rename to programs/games/checkers/Tupfile.lua index f0765e2cac..3f7b0d58ad 100644 --- a/programs/games/checkers/trunk/Tupfile.lua +++ b/programs/games/checkers/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_GCC") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_newlib.lua") diff --git a/programs/games/checkers/trunk/board.h b/programs/games/checkers/board.h similarity index 100% rename from programs/games/checkers/trunk/board.h rename to programs/games/checkers/board.h diff --git a/programs/games/checkers/trunk/buttons.h b/programs/games/checkers/buttons.h similarity index 100% rename from programs/games/checkers/trunk/buttons.h rename to programs/games/checkers/buttons.h diff --git a/programs/games/checkers/trunk/checkers.cpp b/programs/games/checkers/checkers.cpp similarity index 100% rename from programs/games/checkers/trunk/checkers.cpp rename to programs/games/checkers/checkers.cpp diff --git a/programs/games/checkers/trunk/compile.txt b/programs/games/checkers/compile.txt similarity index 100% rename from programs/games/checkers/trunk/compile.txt rename to programs/games/checkers/compile.txt diff --git a/programs/games/checkers/trunk/dos-draw.h b/programs/games/checkers/dos-draw.h similarity index 100% rename from programs/games/checkers/trunk/dos-draw.h rename to programs/games/checkers/dos-draw.h diff --git a/programs/games/checkers/trunk/dosmouse.h b/programs/games/checkers/dosmouse.h similarity index 100% rename from programs/games/checkers/trunk/dosmouse.h rename to programs/games/checkers/dosmouse.h diff --git a/programs/games/checkers/trunk/egavga.bgi b/programs/games/checkers/egavga.bgi similarity index 100% rename from programs/games/checkers/trunk/egavga.bgi rename to programs/games/checkers/egavga.bgi diff --git a/programs/games/checkers/trunk/gnu-draw.h b/programs/games/checkers/gnu-draw.h similarity index 100% rename from programs/games/checkers/trunk/gnu-draw.h rename to programs/games/checkers/gnu-draw.h diff --git a/programs/games/checkers/trunk/gr-draw.h b/programs/games/checkers/gr-draw.h similarity index 100% rename from programs/games/checkers/trunk/gr-draw.h rename to programs/games/checkers/gr-draw.h diff --git a/programs/games/checkers/trunk/hash.h b/programs/games/checkers/hash.h similarity index 100% rename from programs/games/checkers/trunk/hash.h rename to programs/games/checkers/hash.h diff --git a/programs/games/checkers/trunk/history.h b/programs/games/checkers/history.h similarity index 100% rename from programs/games/checkers/trunk/history.h rename to programs/games/checkers/history.h diff --git a/programs/games/checkers/trunk/keysym.h b/programs/games/checkers/keysym.h similarity index 100% rename from programs/games/checkers/trunk/keysym.h rename to programs/games/checkers/keysym.h diff --git a/programs/games/checkers/trunk/kolibri-draw.h b/programs/games/checkers/kolibri-draw.h similarity index 100% rename from programs/games/checkers/trunk/kolibri-draw.h rename to programs/games/checkers/kolibri-draw.h diff --git a/programs/games/checkers/trunk/makefile b/programs/games/checkers/makefile similarity index 100% rename from programs/games/checkers/trunk/makefile rename to programs/games/checkers/makefile diff --git a/programs/games/checkers/trunk/player.h b/programs/games/checkers/player.h similarity index 100% rename from programs/games/checkers/trunk/player.h rename to programs/games/checkers/player.h diff --git a/programs/games/checkers/trunk/position.h b/programs/games/checkers/position.h similarity index 100% rename from programs/games/checkers/trunk/position.h rename to programs/games/checkers/position.h diff --git a/programs/games/checkers/trunk/sysproc.h b/programs/games/checkers/sysproc.h similarity index 100% rename from programs/games/checkers/trunk/sysproc.h rename to programs/games/checkers/sysproc.h diff --git a/programs/games/checkers/trunk/tmplayer.h b/programs/games/checkers/tmplayer.h similarity index 100% rename from programs/games/checkers/trunk/tmplayer.h rename to programs/games/checkers/tmplayer.h diff --git a/programs/games/checkers/trunk/win-chk.rc b/programs/games/checkers/win-chk.rc similarity index 100% rename from programs/games/checkers/trunk/win-chk.rc rename to programs/games/checkers/win-chk.rc diff --git a/programs/games/checkers/trunk/win-chk.res b/programs/games/checkers/win-chk.res similarity index 100% rename from programs/games/checkers/trunk/win-chk.res rename to programs/games/checkers/win-chk.res diff --git a/programs/games/checkers/trunk/win-draw.h b/programs/games/checkers/win-draw.h similarity index 100% rename from programs/games/checkers/trunk/win-draw.h rename to programs/games/checkers/win-draw.h diff --git a/programs/games/checkers/trunk/winabout.rh b/programs/games/checkers/winabout.rh similarity index 100% rename from programs/games/checkers/trunk/winabout.rh rename to programs/games/checkers/winabout.rh diff --git a/programs/games/clicks/trunk/History.txt b/programs/games/clicks/History.txt similarity index 100% rename from programs/games/clicks/trunk/History.txt rename to programs/games/clicks/History.txt diff --git a/programs/games/clicks/trunk/Tupfile.lua b/programs/games/clicks/Tupfile.lua similarity index 100% rename from programs/games/clicks/trunk/Tupfile.lua rename to programs/games/clicks/Tupfile.lua diff --git a/programs/games/clicks/trunk/clicks.c b/programs/games/clicks/clicks.c similarity index 100% rename from programs/games/clicks/trunk/clicks.c rename to programs/games/clicks/clicks.c diff --git a/programs/games/clicks/trunk/compile_eng.bat b/programs/games/clicks/compile_eng.bat similarity index 100% rename from programs/games/clicks/trunk/compile_eng.bat rename to programs/games/clicks/compile_eng.bat diff --git a/programs/games/clicks/trunk/compile_rus.bat b/programs/games/clicks/compile_rus.bat similarity index 100% rename from programs/games/clicks/trunk/compile_rus.bat rename to programs/games/clicks/compile_rus.bat diff --git a/programs/games/clicks/trunk/lib/boxes.png b/programs/games/clicks/lib/boxes.png similarity index 100% rename from programs/games/clicks/trunk/lib/boxes.png rename to programs/games/clicks/lib/boxes.png diff --git a/programs/games/clicks/trunk/lib/boxes.raw b/programs/games/clicks/lib/boxes.raw similarity index 100% rename from programs/games/clicks/trunk/lib/boxes.raw rename to programs/games/clicks/lib/boxes.raw diff --git a/programs/games/clicks/trunk/lib/cups.png b/programs/games/clicks/lib/cups.png similarity index 100% rename from programs/games/clicks/trunk/lib/cups.png rename to programs/games/clicks/lib/cups.png diff --git a/programs/games/clicks/trunk/lib/kolibri.h b/programs/games/clicks/lib/kolibri.h similarity index 100% rename from programs/games/clicks/trunk/lib/kolibri.h rename to programs/games/clicks/lib/kolibri.h diff --git a/programs/games/clicks/trunk/lib/random.h b/programs/games/clicks/lib/random.h similarity index 100% rename from programs/games/clicks/trunk/lib/random.h rename to programs/games/clicks/lib/random.h diff --git a/programs/games/fara/trunk/KosFile.cpp b/programs/games/fara/KosFile.cpp similarity index 100% rename from programs/games/fara/trunk/KosFile.cpp rename to programs/games/fara/KosFile.cpp diff --git a/programs/games/fara/trunk/KosFile.h b/programs/games/fara/KosFile.h similarity index 100% rename from programs/games/fara/trunk/KosFile.h rename to programs/games/fara/KosFile.h diff --git a/programs/games/fara/trunk/MCSMEMM.H b/programs/games/fara/MCSMEMM.H similarity index 100% rename from programs/games/fara/trunk/MCSMEMM.H rename to programs/games/fara/MCSMEMM.H diff --git a/programs/games/fara/trunk/Tupfile.lua b/programs/games/fara/Tupfile.lua similarity index 83% rename from programs/games/fara/trunk/Tupfile.lua rename to programs/games/fara/Tupfile.lua index 5fd2981eaf..5a1b08179f 100644 --- a/programs/games/fara/trunk/Tupfile.lua +++ b/programs/games/fara/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_MSVC") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_msvc.lua") if tup.getconfig("LANG") == "ru_RU" then CFLAGS = CFLAGS .. " /DLANG=RUS" diff --git a/programs/games/fara/trunk/bmp2src.exe b/programs/games/fara/bmp2src.exe similarity index 100% rename from programs/games/fara/trunk/bmp2src.exe rename to programs/games/fara/bmp2src.exe diff --git a/programs/games/fara/trunk/bmp2src/bmp2src.dsp b/programs/games/fara/bmp2src/bmp2src.dsp similarity index 100% rename from programs/games/fara/trunk/bmp2src/bmp2src.dsp rename to programs/games/fara/bmp2src/bmp2src.dsp diff --git a/programs/games/fara/trunk/bmp2src/bmp2src.dsw b/programs/games/fara/bmp2src/bmp2src.dsw similarity index 100% rename from programs/games/fara/trunk/bmp2src/bmp2src.dsw rename to programs/games/fara/bmp2src/bmp2src.dsw diff --git a/programs/games/fara/trunk/bmp2src/lzmapack.lib b/programs/games/fara/bmp2src/lzmapack.lib similarity index 100% rename from programs/games/fara/trunk/bmp2src/lzmapack.lib rename to programs/games/fara/bmp2src/lzmapack.lib diff --git a/programs/games/fara/trunk/bmp2src/main.cpp b/programs/games/fara/bmp2src/main.cpp similarity index 100% rename from programs/games/fara/trunk/bmp2src/main.cpp rename to programs/games/fara/bmp2src/main.cpp diff --git a/programs/games/fara/trunk/build_gfx.bat b/programs/games/fara/build_gfx.bat similarity index 100% rename from programs/games/fara/trunk/build_gfx.bat rename to programs/games/fara/build_gfx.bat diff --git a/programs/games/fara/trunk/crc32.cpp b/programs/games/fara/crc32.cpp similarity index 100% rename from programs/games/fara/trunk/crc32.cpp rename to programs/games/fara/crc32.cpp diff --git a/programs/games/fara/trunk/crc32.h b/programs/games/fara/crc32.h similarity index 100% rename from programs/games/fara/trunk/crc32.h rename to programs/games/fara/crc32.h diff --git a/programs/games/fara/trunk/face.bmp b/programs/games/fara/face.bmp similarity index 100% rename from programs/games/fara/trunk/face.bmp rename to programs/games/fara/face.bmp diff --git a/programs/games/fara/trunk/face.jpg b/programs/games/fara/face.jpg similarity index 100% rename from programs/games/fara/trunk/face.jpg rename to programs/games/fara/face.jpg diff --git a/programs/games/fara/trunk/fara.sln b/programs/games/fara/fara.sln similarity index 100% rename from programs/games/fara/trunk/fara.sln rename to programs/games/fara/fara.sln diff --git a/programs/games/fara/trunk/fara.vcproj b/programs/games/fara/fara.vcproj similarity index 100% rename from programs/games/fara/trunk/fara.vcproj rename to programs/games/fara/fara.vcproj diff --git a/programs/games/fara/trunk/gameWnd.cpp b/programs/games/fara/gameWnd.cpp similarity index 100% rename from programs/games/fara/trunk/gameWnd.cpp rename to programs/games/fara/gameWnd.cpp diff --git a/programs/games/fara/trunk/gameWnd.h b/programs/games/fara/gameWnd.h similarity index 100% rename from programs/games/fara/trunk/gameWnd.h rename to programs/games/fara/gameWnd.h diff --git a/programs/games/fara/trunk/gfxdef.cpp b/programs/games/fara/gfxdef.cpp similarity index 100% rename from programs/games/fara/trunk/gfxdef.cpp rename to programs/games/fara/gfxdef.cpp diff --git a/programs/games/fara/trunk/gfxdef.h b/programs/games/fara/gfxdef.h similarity index 100% rename from programs/games/fara/trunk/gfxdef.h rename to programs/games/fara/gfxdef.h diff --git a/programs/games/fara/trunk/gmplace.bmp b/programs/games/fara/gmplace.bmp similarity index 100% rename from programs/games/fara/trunk/gmplace.bmp rename to programs/games/fara/gmplace.bmp diff --git a/programs/games/fara/trunk/gmplace.jpg b/programs/games/fara/gmplace.jpg similarity index 100% rename from programs/games/fara/trunk/gmplace.jpg rename to programs/games/fara/gmplace.jpg diff --git a/programs/games/fara/trunk/grobfar.txt b/programs/games/fara/grobfar.txt similarity index 100% rename from programs/games/fara/trunk/grobfar.txt rename to programs/games/fara/grobfar.txt diff --git a/programs/games/fara/trunk/kosSyst.cpp b/programs/games/fara/kosSyst.cpp similarity index 100% rename from programs/games/fara/trunk/kosSyst.cpp rename to programs/games/fara/kosSyst.cpp diff --git a/programs/games/fara/trunk/kosSyst.h b/programs/games/fara/kosSyst.h similarity index 100% rename from programs/games/fara/trunk/kosSyst.h rename to programs/games/fara/kosSyst.h diff --git a/programs/games/fara/trunk/lang.h b/programs/games/fara/lang.h similarity index 100% rename from programs/games/fara/trunk/lang.h rename to programs/games/fara/lang.h diff --git a/programs/games/fara/trunk/lzma_unpack.asm b/programs/games/fara/lzma_unpack.asm similarity index 100% rename from programs/games/fara/trunk/lzma_unpack.asm rename to programs/games/fara/lzma_unpack.asm diff --git a/programs/games/fara/trunk/lzma_unpack.obj b/programs/games/fara/lzma_unpack.obj similarity index 100% rename from programs/games/fara/trunk/lzma_unpack.obj rename to programs/games/fara/lzma_unpack.obj diff --git a/programs/games/fara/trunk/main.cpp b/programs/games/fara/main.cpp similarity index 100% rename from programs/games/fara/trunk/main.cpp rename to programs/games/fara/main.cpp diff --git a/programs/games/fara/trunk/mainWnd.cpp b/programs/games/fara/mainWnd.cpp similarity index 100% rename from programs/games/fara/trunk/mainWnd.cpp rename to programs/games/fara/mainWnd.cpp diff --git a/programs/games/fara/trunk/mainWnd.h b/programs/games/fara/mainWnd.h similarity index 100% rename from programs/games/fara/trunk/mainWnd.h rename to programs/games/fara/mainWnd.h diff --git a/programs/games/fara/trunk/mainfish.bmp b/programs/games/fara/mainfish.bmp similarity index 100% rename from programs/games/fara/trunk/mainfish.bmp rename to programs/games/fara/mainfish.bmp diff --git a/programs/games/fara/trunk/mcarray.h b/programs/games/fara/mcarray.h similarity index 100% rename from programs/games/fara/trunk/mcarray.h rename to programs/games/fara/mcarray.h diff --git a/programs/games/fara/trunk/mcsmemm.cpp b/programs/games/fara/mcsmemm.cpp similarity index 100% rename from programs/games/fara/trunk/mcsmemm.cpp rename to programs/games/fara/mcsmemm.cpp diff --git a/programs/games/fara/trunk/memcmp.asm b/programs/games/fara/memcmp.asm similarity index 100% rename from programs/games/fara/trunk/memcmp.asm rename to programs/games/fara/memcmp.asm diff --git a/programs/games/fara/trunk/numbers.bmp b/programs/games/fara/numbers.bmp similarity index 100% rename from programs/games/fara/trunk/numbers.bmp rename to programs/games/fara/numbers.bmp diff --git a/programs/games/fara/trunk/top10wnd.cpp b/programs/games/fara/top10wnd.cpp similarity index 100% rename from programs/games/fara/trunk/top10wnd.cpp rename to programs/games/fara/top10wnd.cpp diff --git a/programs/games/fara/trunk/top10wnd.h b/programs/games/fara/top10wnd.h similarity index 100% rename from programs/games/fara/trunk/top10wnd.h rename to programs/games/fara/top10wnd.h diff --git a/programs/games/flood-it/trunk/Tupfile.lua b/programs/games/flood-it/Tupfile.lua similarity index 100% rename from programs/games/flood-it/trunk/Tupfile.lua rename to programs/games/flood-it/Tupfile.lua diff --git a/programs/games/flood-it/trunk/compile_eng.bat b/programs/games/flood-it/compile_eng.bat similarity index 100% rename from programs/games/flood-it/trunk/compile_eng.bat rename to programs/games/flood-it/compile_eng.bat diff --git a/programs/games/flood-it/trunk/compile_rus.bat b/programs/games/flood-it/compile_rus.bat similarity index 100% rename from programs/games/flood-it/trunk/compile_rus.bat rename to programs/games/flood-it/compile_rus.bat diff --git a/programs/games/flood-it/trunk/flood-it.c b/programs/games/flood-it/flood-it.c similarity index 100% rename from programs/games/flood-it/trunk/flood-it.c rename to programs/games/flood-it/flood-it.c diff --git a/programs/games/flood-it/trunk/lib/kolibri.h b/programs/games/flood-it/lib/kolibri.h similarity index 100% rename from programs/games/flood-it/trunk/lib/kolibri.h rename to programs/games/flood-it/lib/kolibri.h diff --git a/programs/games/flood-it/trunk/lib/random.h b/programs/games/flood-it/lib/random.h similarity index 100% rename from programs/games/flood-it/trunk/lib/random.h rename to programs/games/flood-it/lib/random.h diff --git a/programs/games/gomoku/trunk/Tupfile.lua b/programs/games/gomoku/Tupfile.lua similarity index 79% rename from programs/games/gomoku/trunk/Tupfile.lua rename to programs/games/gomoku/Tupfile.lua index ae3c67746e..b7061e1889 100644 --- a/programs/games/gomoku/trunk/Tupfile.lua +++ b/programs/games/gomoku/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/gomoku/trunk/build_en.bat b/programs/games/gomoku/build_en.bat similarity index 100% rename from programs/games/gomoku/trunk/build_en.bat rename to programs/games/gomoku/build_en.bat diff --git a/programs/games/gomoku/trunk/build_ru.bat b/programs/games/gomoku/build_ru.bat similarity index 100% rename from programs/games/gomoku/trunk/build_ru.bat rename to programs/games/gomoku/build_ru.bat diff --git a/programs/games/gomoku/trunk/gomoku.asm b/programs/games/gomoku/gomoku.asm similarity index 99% rename from programs/games/gomoku/trunk/gomoku.asm rename to programs/games/gomoku/gomoku.asm index d97c624807..d14ff389a8 100644 --- a/programs/games/gomoku/trunk/gomoku.asm +++ b/programs/games/gomoku/gomoku.asm @@ -12,7 +12,7 @@ use32 dd E_END dd 0x0,0x0 -include '../../../macros.inc' +include '../../macros.inc' include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US. AttackFactor dw 1 ; Importance of attack (1..16) diff --git a/programs/games/gomoku/trunk/makefile b/programs/games/gomoku/makefile similarity index 100% rename from programs/games/gomoku/trunk/makefile rename to programs/games/gomoku/makefile diff --git a/programs/games/hunter/trunk/Tupfile.lua b/programs/games/hunter/Tupfile.lua similarity index 100% rename from programs/games/hunter/trunk/Tupfile.lua rename to programs/games/hunter/Tupfile.lua diff --git a/programs/games/hunter/trunk/build.bat b/programs/games/hunter/build.bat similarity index 100% rename from programs/games/hunter/trunk/build.bat rename to programs/games/hunter/build.bat diff --git a/programs/games/hunter/trunk/hunter.asm b/programs/games/hunter/hunter.asm similarity index 94% rename from programs/games/hunter/trunk/hunter.asm rename to programs/games/hunter/hunter.asm index e9076d6ff8..03e7b73d24 100644 --- a/programs/games/hunter/trunk/hunter.asm +++ b/programs/games/hunter/hunter.asm @@ -9,7 +9,7 @@ ; Target: MenuetOS game ; -include '..\..\..\macros.inc' +include '..\..\macros.inc' use32 @@ -668,4 +668,4 @@ buffer01: buffer02: org $+640*401*3 org $+640*40*3 -end_memory: \ No newline at end of file +end_memory: diff --git a/programs/games/hunter/trunk/inc/exit.inc b/programs/games/hunter/inc/exit.inc similarity index 100% rename from programs/games/hunter/trunk/inc/exit.inc rename to programs/games/hunter/inc/exit.inc diff --git a/programs/games/hunter/trunk/inc/fire00.inc b/programs/games/hunter/inc/fire00.inc similarity index 100% rename from programs/games/hunter/trunk/inc/fire00.inc rename to programs/games/hunter/inc/fire00.inc diff --git a/programs/games/hunter/trunk/inc/fire01.inc b/programs/games/hunter/inc/fire01.inc similarity index 100% rename from programs/games/hunter/trunk/inc/fire01.inc rename to programs/games/hunter/inc/fire01.inc diff --git a/programs/games/hunter/trunk/inc/fire02.inc b/programs/games/hunter/inc/fire02.inc similarity index 100% rename from programs/games/hunter/trunk/inc/fire02.inc rename to programs/games/hunter/inc/fire02.inc diff --git a/programs/games/hunter/trunk/inc/gameover.inc b/programs/games/hunter/inc/gameover.inc similarity index 100% rename from programs/games/hunter/trunk/inc/gameover.inc rename to programs/games/hunter/inc/gameover.inc diff --git a/programs/games/hunter/trunk/inc/glass.inc b/programs/games/hunter/inc/glass.inc similarity index 100% rename from programs/games/hunter/trunk/inc/glass.inc rename to programs/games/hunter/inc/glass.inc diff --git a/programs/games/hunter/trunk/inc/glaz.inc b/programs/games/hunter/inc/glaz.inc similarity index 100% rename from programs/games/hunter/trunk/inc/glaz.inc rename to programs/games/hunter/inc/glaz.inc diff --git a/programs/games/hunter/trunk/inc/gun00.inc b/programs/games/hunter/inc/gun00.inc similarity index 100% rename from programs/games/hunter/trunk/inc/gun00.inc rename to programs/games/hunter/inc/gun00.inc diff --git a/programs/games/hunter/trunk/inc/gun01.inc b/programs/games/hunter/inc/gun01.inc similarity index 100% rename from programs/games/hunter/trunk/inc/gun01.inc rename to programs/games/hunter/inc/gun01.inc diff --git a/programs/games/hunter/trunk/inc/gun02.inc b/programs/games/hunter/inc/gun02.inc similarity index 100% rename from programs/games/hunter/trunk/inc/gun02.inc rename to programs/games/hunter/inc/gun02.inc diff --git a/programs/games/hunter/trunk/inc/heart.inc b/programs/games/hunter/inc/heart.inc similarity index 100% rename from programs/games/hunter/trunk/inc/heart.inc rename to programs/games/hunter/inc/heart.inc diff --git a/programs/games/hunter/trunk/inc/heart02.inc b/programs/games/hunter/inc/heart02.inc similarity index 100% rename from programs/games/hunter/trunk/inc/heart02.inc rename to programs/games/hunter/inc/heart02.inc diff --git a/programs/games/hunter/trunk/inc/hole.inc b/programs/games/hunter/inc/hole.inc similarity index 100% rename from programs/games/hunter/trunk/inc/hole.inc rename to programs/games/hunter/inc/hole.inc diff --git a/programs/games/hunter/trunk/inc/kust01.inc b/programs/games/hunter/inc/kust01.inc similarity index 100% rename from programs/games/hunter/trunk/inc/kust01.inc rename to programs/games/hunter/inc/kust01.inc diff --git a/programs/games/hunter/trunk/inc/kust02.inc b/programs/games/hunter/inc/kust02.inc similarity index 100% rename from programs/games/hunter/trunk/inc/kust02.inc rename to programs/games/hunter/inc/kust02.inc diff --git a/programs/games/hunter/trunk/inc/lives.inc b/programs/games/hunter/inc/lives.inc similarity index 100% rename from programs/games/hunter/trunk/inc/lives.inc rename to programs/games/hunter/inc/lives.inc diff --git a/programs/games/hunter/trunk/inc/minus.inc b/programs/games/hunter/inc/minus.inc similarity index 100% rename from programs/games/hunter/trunk/inc/minus.inc rename to programs/games/hunter/inc/minus.inc diff --git a/programs/games/hunter/trunk/inc/mushka.inc b/programs/games/hunter/inc/mushka.inc similarity index 100% rename from programs/games/hunter/trunk/inc/mushka.inc rename to programs/games/hunter/inc/mushka.inc diff --git a/programs/games/hunter/trunk/inc/net.inc b/programs/games/hunter/inc/net.inc similarity index 100% rename from programs/games/hunter/trunk/inc/net.inc rename to programs/games/hunter/inc/net.inc diff --git a/programs/games/hunter/trunk/inc/num0.inc b/programs/games/hunter/inc/num0.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num0.inc rename to programs/games/hunter/inc/num0.inc diff --git a/programs/games/hunter/trunk/inc/num1.inc b/programs/games/hunter/inc/num1.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num1.inc rename to programs/games/hunter/inc/num1.inc diff --git a/programs/games/hunter/trunk/inc/num2.inc b/programs/games/hunter/inc/num2.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num2.inc rename to programs/games/hunter/inc/num2.inc diff --git a/programs/games/hunter/trunk/inc/num3.inc b/programs/games/hunter/inc/num3.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num3.inc rename to programs/games/hunter/inc/num3.inc diff --git a/programs/games/hunter/trunk/inc/num4.inc b/programs/games/hunter/inc/num4.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num4.inc rename to programs/games/hunter/inc/num4.inc diff --git a/programs/games/hunter/trunk/inc/num5.inc b/programs/games/hunter/inc/num5.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num5.inc rename to programs/games/hunter/inc/num5.inc diff --git a/programs/games/hunter/trunk/inc/num6.inc b/programs/games/hunter/inc/num6.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num6.inc rename to programs/games/hunter/inc/num6.inc diff --git a/programs/games/hunter/trunk/inc/num7.inc b/programs/games/hunter/inc/num7.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num7.inc rename to programs/games/hunter/inc/num7.inc diff --git a/programs/games/hunter/trunk/inc/num8.inc b/programs/games/hunter/inc/num8.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num8.inc rename to programs/games/hunter/inc/num8.inc diff --git a/programs/games/hunter/trunk/inc/num9.inc b/programs/games/hunter/inc/num9.inc similarity index 100% rename from programs/games/hunter/trunk/inc/num9.inc rename to programs/games/hunter/inc/num9.inc diff --git a/programs/games/hunter/trunk/inc/numbers.inc b/programs/games/hunter/inc/numbers.inc similarity index 100% rename from programs/games/hunter/trunk/inc/numbers.inc rename to programs/games/hunter/inc/numbers.inc diff --git a/programs/games/hunter/trunk/inc/oblako.inc b/programs/games/hunter/inc/oblako.inc similarity index 100% rename from programs/games/hunter/trunk/inc/oblako.inc rename to programs/games/hunter/inc/oblako.inc diff --git a/programs/games/hunter/trunk/inc/pause.inc b/programs/games/hunter/inc/pause.inc similarity index 100% rename from programs/games/hunter/trunk/inc/pause.inc rename to programs/games/hunter/inc/pause.inc diff --git a/programs/games/hunter/trunk/inc/plane00.inc b/programs/games/hunter/inc/plane00.inc similarity index 100% rename from programs/games/hunter/trunk/inc/plane00.inc rename to programs/games/hunter/inc/plane00.inc diff --git a/programs/games/hunter/trunk/inc/plane01.inc b/programs/games/hunter/inc/plane01.inc similarity index 100% rename from programs/games/hunter/trunk/inc/plane01.inc rename to programs/games/hunter/inc/plane01.inc diff --git a/programs/games/hunter/trunk/inc/plus.inc b/programs/games/hunter/inc/plus.inc similarity index 100% rename from programs/games/hunter/trunk/inc/plus.inc rename to programs/games/hunter/inc/plus.inc diff --git a/programs/games/hunter/trunk/inc/rock.inc b/programs/games/hunter/inc/rock.inc similarity index 100% rename from programs/games/hunter/trunk/inc/rock.inc rename to programs/games/hunter/inc/rock.inc diff --git a/programs/games/hunter/trunk/inc/score.inc b/programs/games/hunter/inc/score.inc similarity index 100% rename from programs/games/hunter/trunk/inc/score.inc rename to programs/games/hunter/inc/score.inc diff --git a/programs/games/hunter/trunk/inc/shots.inc b/programs/games/hunter/inc/shots.inc similarity index 100% rename from programs/games/hunter/trunk/inc/shots.inc rename to programs/games/hunter/inc/shots.inc diff --git a/programs/games/hunter/trunk/inc/star.inc b/programs/games/hunter/inc/star.inc similarity index 100% rename from programs/games/hunter/trunk/inc/star.inc rename to programs/games/hunter/inc/star.inc diff --git a/programs/games/hunter/trunk/inc/start.inc b/programs/games/hunter/inc/start.inc similarity index 100% rename from programs/games/hunter/trunk/inc/start.inc rename to programs/games/hunter/inc/start.inc diff --git a/programs/games/hunter/trunk/inc/sun.inc b/programs/games/hunter/inc/sun.inc similarity index 100% rename from programs/games/hunter/trunk/inc/sun.inc rename to programs/games/hunter/inc/sun.inc diff --git a/programs/games/hunter/trunk/inc/time.inc b/programs/games/hunter/inc/time.inc similarity index 100% rename from programs/games/hunter/trunk/inc/time.inc rename to programs/games/hunter/inc/time.inc diff --git a/programs/games/hunter/trunk/math.inc b/programs/games/hunter/math.inc similarity index 100% rename from programs/games/hunter/trunk/math.inc rename to programs/games/hunter/math.inc diff --git a/programs/games/hunter/trunk/object.inc b/programs/games/hunter/object.inc similarity index 100% rename from programs/games/hunter/trunk/object.inc rename to programs/games/hunter/object.inc diff --git a/programs/games/hunter/trunk/picture.inc b/programs/games/hunter/picture.inc similarity index 100% rename from programs/games/hunter/trunk/picture.inc rename to programs/games/hunter/picture.inc diff --git a/programs/games/hunter/trunk/read_me.eng b/programs/games/hunter/read_me.eng similarity index 100% rename from programs/games/hunter/trunk/read_me.eng rename to programs/games/hunter/read_me.eng diff --git a/programs/games/hunter/trunk/read_me.rus b/programs/games/hunter/read_me.rus similarity index 100% rename from programs/games/hunter/trunk/read_me.rus rename to programs/games/hunter/read_me.rus diff --git a/programs/games/klavisha/trunk/Tupfile.lua b/programs/games/klavisha/Tupfile.lua similarity index 79% rename from programs/games/klavisha/trunk/Tupfile.lua rename to programs/games/klavisha/Tupfile.lua index 62a359924a..1ab0f6d472 100644 --- a/programs/games/klavisha/trunk/Tupfile.lua +++ b/programs/games/klavisha/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/klavisha/trunk/build.bat b/programs/games/klavisha/build.bat similarity index 100% rename from programs/games/klavisha/trunk/build.bat rename to programs/games/klavisha/build.bat diff --git a/programs/games/klavisha/trunk/courses/BASEKURS.ASM b/programs/games/klavisha/courses/BASEKURS.ASM similarity index 100% rename from programs/games/klavisha/trunk/courses/BASEKURS.ASM rename to programs/games/klavisha/courses/BASEKURS.ASM diff --git a/programs/games/klavisha/trunk/courses/BASEKURS.KLA b/programs/games/klavisha/courses/BASEKURS.KLA similarity index 100% rename from programs/games/klavisha/trunk/courses/BASEKURS.KLA rename to programs/games/klavisha/courses/BASEKURS.KLA diff --git a/programs/games/klavisha/trunk/courses/SAMPLE.ASM b/programs/games/klavisha/courses/SAMPLE.ASM similarity index 100% rename from programs/games/klavisha/trunk/courses/SAMPLE.ASM rename to programs/games/klavisha/courses/SAMPLE.ASM diff --git a/programs/games/klavisha/trunk/courses/SAMPLE.KLA b/programs/games/klavisha/courses/SAMPLE.KLA similarity index 100% rename from programs/games/klavisha/trunk/courses/SAMPLE.KLA rename to programs/games/klavisha/courses/SAMPLE.KLA diff --git a/programs/games/klavisha/trunk/data.inc b/programs/games/klavisha/data.inc similarity index 100% rename from programs/games/klavisha/trunk/data.inc rename to programs/games/klavisha/data.inc diff --git a/programs/games/klavisha/trunk/klavisha.asm b/programs/games/klavisha/klavisha.asm similarity index 96% rename from programs/games/klavisha/trunk/klavisha.asm rename to programs/games/klavisha/klavisha.asm index 56fecd17de..a65ac44c4a 100644 --- a/programs/games/klavisha/trunk/klavisha.asm +++ b/programs/games/klavisha/klavisha.asm @@ -27,7 +27,7 @@ dd 0x0 ;--------------------------------------------------------------------- include 'lang.inc' -include '../../../macros.inc' +include '../../macros.inc' ;--------------------------------------------------------------------- ;Š®¤ ¯à®£à ¬¬ë START: @@ -668,4 +668,4 @@ procinfo: rb 1024 stacktop: ;--------------------------------------------------------------------- -I_END: \ No newline at end of file +I_END: diff --git a/programs/games/klavisha/trunk/readme.txt b/programs/games/klavisha/readme.txt similarity index 100% rename from programs/games/klavisha/trunk/readme.txt rename to programs/games/klavisha/readme.txt diff --git a/programs/games/kox/trunk/Tupfile.lua b/programs/games/kox/Tupfile.lua similarity index 100% rename from programs/games/kox/trunk/Tupfile.lua rename to programs/games/kox/Tupfile.lua diff --git a/programs/games/kox/trunk/build.bat b/programs/games/kox/build.bat similarity index 100% rename from programs/games/kox/trunk/build.bat rename to programs/games/kox/build.bat diff --git a/programs/games/kox/trunk/build.sh b/programs/games/kox/build.sh similarity index 100% rename from programs/games/kox/trunk/build.sh rename to programs/games/kox/build.sh diff --git a/programs/games/kox/trunk/data.inc b/programs/games/kox/data.inc similarity index 100% rename from programs/games/kox/trunk/data.inc rename to programs/games/kox/data.inc diff --git a/programs/games/kox/trunk/kox.asm b/programs/games/kox/kox.asm similarity index 100% rename from programs/games/kox/trunk/kox.asm rename to programs/games/kox/kox.asm diff --git a/programs/games/kox/trunk/kox.txt b/programs/games/kox/kox.txt similarity index 100% rename from programs/games/kox/trunk/kox.txt rename to programs/games/kox/kox.txt diff --git a/programs/games/kox/trunk/macs.inc b/programs/games/kox/macs.inc similarity index 100% rename from programs/games/kox/trunk/macs.inc rename to programs/games/kox/macs.inc diff --git a/programs/games/kox/trunk/main.inc b/programs/games/kox/main.inc similarity index 100% rename from programs/games/kox/trunk/main.inc rename to programs/games/kox/main.inc diff --git a/programs/games/life3/trunk/Tupfile.lua b/programs/games/life3/Tupfile.lua similarity index 78% rename from programs/games/life3/trunk/Tupfile.lua rename to programs/games/life3/Tupfile.lua index 9c9f20def0..89277ac3e8 100644 --- a/programs/games/life3/trunk/Tupfile.lua +++ b/programs/games/life3/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/life3/trunk/build_ru.bat b/programs/games/life3/build_ru.bat similarity index 100% rename from programs/games/life3/trunk/build_ru.bat rename to programs/games/life3/build_ru.bat diff --git a/programs/games/life3/trunk/life3.asm b/programs/games/life3/life3.asm similarity index 99% rename from programs/games/life3/trunk/life3.asm rename to programs/games/life3/life3.asm index fecdc79826..2241ba0482 100644 --- a/programs/games/life3/trunk/life3.asm +++ b/programs/games/life3/life3.asm @@ -3,11 +3,11 @@ use32 db 'MENUET01' dd 1,start,i_end,mem,stacktop,0,sys_path -include '../../../macros.inc' -include '../../../proc32.inc' -include '../../../KOSfuncs.inc' -include '../../../load_img.inc' -include '../../../load_lib.mac' +include '../../macros.inc' +include '../../proc32.inc' +include '../../KOSfuncs.inc' +include '../../load_img.inc' +include '../../load_lib.mac' ;include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US. diff --git a/programs/games/life3/trunk/life3tb.png b/programs/games/life3/life3tb.png similarity index 100% rename from programs/games/life3/trunk/life3tb.png rename to programs/games/life3/life3tb.png diff --git a/programs/games/lights/trunk/Lights_HINT.PNG b/programs/games/lights/Lights_HINT.PNG similarity index 100% rename from programs/games/lights/trunk/Lights_HINT.PNG rename to programs/games/lights/Lights_HINT.PNG diff --git a/programs/games/lights/trunk/Tupfile.lua b/programs/games/lights/Tupfile.lua similarity index 100% rename from programs/games/lights/trunk/Tupfile.lua rename to programs/games/lights/Tupfile.lua diff --git a/programs/games/lights/trunk/data.inc b/programs/games/lights/data.inc similarity index 100% rename from programs/games/lights/trunk/data.inc rename to programs/games/lights/data.inc diff --git a/programs/games/lights/trunk/lights.asm b/programs/games/lights/lights.asm similarity index 100% rename from programs/games/lights/trunk/lights.asm rename to programs/games/lights/lights.asm diff --git a/programs/games/lights/trunk/lights.txt b/programs/games/lights/lights.txt similarity index 100% rename from programs/games/lights/trunk/lights.txt rename to programs/games/lights/lights.txt diff --git a/programs/games/lights/trunk/macs.inc b/programs/games/lights/macs.inc similarity index 100% rename from programs/games/lights/trunk/macs.inc rename to programs/games/lights/macs.inc diff --git a/programs/games/lights/trunk/main.inc b/programs/games/lights/main.inc similarity index 100% rename from programs/games/lights/trunk/main.inc rename to programs/games/lights/main.inc diff --git a/programs/games/mario2/trunk/MARIO.ASM b/programs/games/mario2/MARIO.ASM similarity index 100% rename from programs/games/mario2/trunk/MARIO.ASM rename to programs/games/mario2/MARIO.ASM diff --git a/programs/games/mario2/trunk/MARIOALL.BMP b/programs/games/mario2/MARIOALL.BMP similarity index 100% rename from programs/games/mario2/trunk/MARIOALL.BMP rename to programs/games/mario2/MARIOALL.BMP diff --git a/programs/games/mario2/trunk/Tupfile.lua b/programs/games/mario2/Tupfile.lua similarity index 100% rename from programs/games/mario2/trunk/Tupfile.lua rename to programs/games/mario2/Tupfile.lua diff --git a/programs/games/mblocks/trunk/Tupfile.lua b/programs/games/mblocks/Tupfile.lua similarity index 100% rename from programs/games/mblocks/trunk/Tupfile.lua rename to programs/games/mblocks/Tupfile.lua diff --git a/programs/games/mblocks/trunk/build_en.bat b/programs/games/mblocks/build_en.bat similarity index 100% rename from programs/games/mblocks/trunk/build_en.bat rename to programs/games/mblocks/build_en.bat diff --git a/programs/games/mblocks/trunk/build_ru.bat b/programs/games/mblocks/build_ru.bat similarity index 100% rename from programs/games/mblocks/trunk/build_ru.bat rename to programs/games/mblocks/build_ru.bat diff --git a/programs/games/mblocks/trunk/mblocks.asm b/programs/games/mblocks/mblocks.asm similarity index 100% rename from programs/games/mblocks/trunk/mblocks.asm rename to programs/games/mblocks/mblocks.asm diff --git a/programs/games/mblocks/trunk/mblocksi.raw b/programs/games/mblocks/mblocksi.raw similarity index 100% rename from programs/games/mblocks/trunk/mblocksi.raw rename to programs/games/mblocks/mblocksi.raw diff --git a/programs/games/mblocks/trunk/mblocksp.raw b/programs/games/mblocks/mblocksp.raw similarity index 100% rename from programs/games/mblocks/trunk/mblocksp.raw rename to programs/games/mblocks/mblocksp.raw diff --git a/programs/games/megamaze/trunk/Tupfile.lua b/programs/games/megamaze/Tupfile.lua similarity index 65% rename from programs/games/megamaze/trunk/Tupfile.lua rename to programs/games/megamaze/Tupfile.lua index 06fe990c71..c002efe79f 100644 --- a/programs/games/megamaze/trunk/Tupfile.lua +++ b/programs/games/megamaze/Tupfile.lua @@ -1,4 +1,4 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") tup.rule("megamaze.asm", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "megamaze") diff --git a/programs/games/megamaze/trunk/blackbox.inc b/programs/games/megamaze/blackbox.inc similarity index 100% rename from programs/games/megamaze/trunk/blackbox.inc rename to programs/games/megamaze/blackbox.inc diff --git a/programs/games/megamaze/trunk/build.bat b/programs/games/megamaze/build.bat similarity index 100% rename from programs/games/megamaze/trunk/build.bat rename to programs/games/megamaze/build.bat diff --git a/programs/games/megamaze/trunk/colzone.bin b/programs/games/megamaze/colzone.bin similarity index 100% rename from programs/games/megamaze/trunk/colzone.bin rename to programs/games/megamaze/colzone.bin diff --git a/programs/games/megamaze/trunk/colzone.inc b/programs/games/megamaze/colzone.inc similarity index 100% rename from programs/games/megamaze/trunk/colzone.inc rename to programs/games/megamaze/colzone.inc diff --git a/programs/games/megamaze/trunk/cstep.bin b/programs/games/megamaze/cstep.bin similarity index 100% rename from programs/games/megamaze/trunk/cstep.bin rename to programs/games/megamaze/cstep.bin diff --git a/programs/games/megamaze/trunk/cstep.inc b/programs/games/megamaze/cstep.inc similarity index 100% rename from programs/games/megamaze/trunk/cstep.inc rename to programs/games/megamaze/cstep.inc diff --git a/programs/games/megamaze/trunk/fhouse.bin b/programs/games/megamaze/fhouse.bin similarity index 100% rename from programs/games/megamaze/trunk/fhouse.bin rename to programs/games/megamaze/fhouse.bin diff --git a/programs/games/megamaze/trunk/fhouse.inc b/programs/games/megamaze/fhouse.inc similarity index 100% rename from programs/games/megamaze/trunk/fhouse.inc rename to programs/games/megamaze/fhouse.inc diff --git a/programs/games/megamaze/trunk/gif_lite.inc b/programs/games/megamaze/gif_lite.inc similarity index 100% rename from programs/games/megamaze/trunk/gif_lite.inc rename to programs/games/megamaze/gif_lite.inc diff --git a/programs/games/megamaze/trunk/loops.bin b/programs/games/megamaze/loops.bin similarity index 100% rename from programs/games/megamaze/trunk/loops.bin rename to programs/games/megamaze/loops.bin diff --git a/programs/games/megamaze/trunk/loops.inc b/programs/games/megamaze/loops.inc similarity index 100% rename from programs/games/megamaze/trunk/loops.inc rename to programs/games/megamaze/loops.inc diff --git a/programs/games/megamaze/trunk/marble.bin b/programs/games/megamaze/marble.bin similarity index 100% rename from programs/games/megamaze/trunk/marble.bin rename to programs/games/megamaze/marble.bin diff --git a/programs/games/megamaze/trunk/marble.inc b/programs/games/megamaze/marble.inc similarity index 100% rename from programs/games/megamaze/trunk/marble.inc rename to programs/games/megamaze/marble.inc diff --git a/programs/games/megamaze/trunk/megamaze.asm b/programs/games/megamaze/megamaze.asm similarity index 100% rename from programs/games/megamaze/trunk/megamaze.asm rename to programs/games/megamaze/megamaze.asm diff --git a/programs/games/megamaze/trunk/nolt.bin b/programs/games/megamaze/nolt.bin similarity index 100% rename from programs/games/megamaze/trunk/nolt.bin rename to programs/games/megamaze/nolt.bin diff --git a/programs/games/megamaze/trunk/nolt.inc b/programs/games/megamaze/nolt.inc similarity index 100% rename from programs/games/megamaze/trunk/nolt.inc rename to programs/games/megamaze/nolt.inc diff --git a/programs/games/megamaze/trunk/omaze.bin b/programs/games/megamaze/omaze.bin similarity index 100% rename from programs/games/megamaze/trunk/omaze.bin rename to programs/games/megamaze/omaze.bin diff --git a/programs/games/megamaze/trunk/or2.bin b/programs/games/megamaze/or2.bin similarity index 100% rename from programs/games/megamaze/trunk/or2.bin rename to programs/games/megamaze/or2.bin diff --git a/programs/games/megamaze/trunk/orient.bin b/programs/games/megamaze/orient.bin similarity index 100% rename from programs/games/megamaze/trunk/orient.bin rename to programs/games/megamaze/orient.bin diff --git a/programs/games/megamaze/trunk/orient.inc b/programs/games/megamaze/orient.inc similarity index 100% rename from programs/games/megamaze/trunk/orient.inc rename to programs/games/megamaze/orient.inc diff --git a/programs/games/megamaze/trunk/orientg2.gif b/programs/games/megamaze/orientg2.gif similarity index 100% rename from programs/games/megamaze/trunk/orientg2.gif rename to programs/games/megamaze/orientg2.gif diff --git a/programs/games/megamaze/trunk/smz.bin b/programs/games/megamaze/smz.bin similarity index 100% rename from programs/games/megamaze/trunk/smz.bin rename to programs/games/megamaze/smz.bin diff --git a/programs/games/megamaze/trunk/smz.inc b/programs/games/megamaze/smz.inc similarity index 100% rename from programs/games/megamaze/trunk/smz.inc rename to programs/games/megamaze/smz.inc diff --git a/programs/games/megamaze/trunk/tam.bin b/programs/games/megamaze/tam.bin similarity index 100% rename from programs/games/megamaze/trunk/tam.bin rename to programs/games/megamaze/tam.bin diff --git a/programs/games/megamaze/trunk/tam.inc b/programs/games/megamaze/tam.inc similarity index 100% rename from programs/games/megamaze/trunk/tam.inc rename to programs/games/megamaze/tam.inc diff --git a/programs/games/megamaze/trunk/tilt.bin b/programs/games/megamaze/tilt.bin similarity index 100% rename from programs/games/megamaze/trunk/tilt.bin rename to programs/games/megamaze/tilt.bin diff --git a/programs/games/megamaze/trunk/tilt.inc b/programs/games/megamaze/tilt.inc similarity index 100% rename from programs/games/megamaze/trunk/tilt.inc rename to programs/games/megamaze/tilt.inc diff --git a/programs/games/megamaze/trunk/tilt2.bin b/programs/games/megamaze/tilt2.bin similarity index 100% rename from programs/games/megamaze/trunk/tilt2.bin rename to programs/games/megamaze/tilt2.bin diff --git a/programs/games/megamaze/trunk/tilt2.inc b/programs/games/megamaze/tilt2.inc similarity index 100% rename from programs/games/megamaze/trunk/tilt2.inc rename to programs/games/megamaze/tilt2.inc diff --git a/programs/games/megamaze/trunk/wriggle.bin b/programs/games/megamaze/wriggle.bin similarity index 100% rename from programs/games/megamaze/trunk/wriggle.bin rename to programs/games/megamaze/wriggle.bin diff --git a/programs/games/megamaze/trunk/wriggle.inc b/programs/games/megamaze/wriggle.inc similarity index 100% rename from programs/games/megamaze/trunk/wriggle.inc rename to programs/games/megamaze/wriggle.inc diff --git a/programs/games/mine/trunk/Tupfile.lua b/programs/games/mine/Tupfile.lua similarity index 100% rename from programs/games/mine/trunk/Tupfile.lua rename to programs/games/mine/Tupfile.lua diff --git a/programs/games/mine/trunk/access.h-- b/programs/games/mine/access.h-- similarity index 100% rename from programs/games/mine/trunk/access.h-- rename to programs/games/mine/access.h-- diff --git a/programs/games/mine/trunk/changelog.txt b/programs/games/mine/changelog.txt similarity index 100% rename from programs/games/mine/trunk/changelog.txt rename to programs/games/mine/changelog.txt diff --git a/programs/games/mine/trunk/draw.h-- b/programs/games/mine/draw.h-- similarity index 100% rename from programs/games/mine/trunk/draw.h-- rename to programs/games/mine/draw.h-- diff --git a/programs/games/mine/trunk/kos_sys.h-- b/programs/games/mine/kos_sys.h-- similarity index 100% rename from programs/games/mine/trunk/kos_sys.h-- rename to programs/games/mine/kos_sys.h-- diff --git a/programs/games/mine/trunk/make.bat b/programs/games/mine/make.bat similarity index 100% rename from programs/games/mine/trunk/make.bat rename to programs/games/mine/make.bat diff --git a/programs/games/mine/trunk/mine.c-- b/programs/games/mine/mine.c-- similarity index 100% rename from programs/games/mine/trunk/mine.c-- rename to programs/games/mine/mine.c-- diff --git a/programs/games/mine/trunk/random.h-- b/programs/games/mine/random.h-- similarity index 100% rename from programs/games/mine/trunk/random.h-- rename to programs/games/mine/random.h-- diff --git a/programs/games/mine/trunk/timer.h-- b/programs/games/mine/timer.h-- similarity index 100% rename from programs/games/mine/trunk/timer.h-- rename to programs/games/mine/timer.h-- diff --git a/programs/games/nu_pogodi/trunk/Tupfile.lua b/programs/games/nu_pogodi/Tupfile.lua similarity index 100% rename from programs/games/nu_pogodi/trunk/Tupfile.lua rename to programs/games/nu_pogodi/Tupfile.lua diff --git a/programs/games/nu_pogodi/trunk/build.bat b/programs/games/nu_pogodi/build.bat similarity index 100% rename from programs/games/nu_pogodi/trunk/build.bat rename to programs/games/nu_pogodi/build.bat diff --git a/programs/games/nu_pogodi/trunk/chi.png b/programs/games/nu_pogodi/chi.png similarity index 100% rename from programs/games/nu_pogodi/trunk/chi.png rename to programs/games/nu_pogodi/chi.png diff --git a/programs/games/nu_pogodi/trunk/curici.png b/programs/games/nu_pogodi/curici.png similarity index 100% rename from programs/games/nu_pogodi/trunk/curici.png rename to programs/games/nu_pogodi/curici.png diff --git a/programs/games/nu_pogodi/trunk/eggs.png b/programs/games/nu_pogodi/eggs.png similarity index 100% rename from programs/games/nu_pogodi/trunk/eggs.png rename to programs/games/nu_pogodi/eggs.png diff --git a/programs/games/nu_pogodi/trunk/help.txt b/programs/games/nu_pogodi/help.txt similarity index 100% rename from programs/games/nu_pogodi/trunk/help.txt rename to programs/games/nu_pogodi/help.txt diff --git a/programs/games/nu_pogodi/trunk/kv_bab.png b/programs/games/nu_pogodi/kv_bab.png similarity index 100% rename from programs/games/nu_pogodi/trunk/kv_bab.png rename to programs/games/nu_pogodi/kv_bab.png diff --git a/programs/games/nu_pogodi/trunk/kv_decor.png b/programs/games/nu_pogodi/kv_decor.png similarity index 100% rename from programs/games/nu_pogodi/trunk/kv_decor.png rename to programs/games/nu_pogodi/kv_decor.png diff --git a/programs/games/nu_pogodi/trunk/kv_lost.png b/programs/games/nu_pogodi/kv_lost.png similarity index 100% rename from programs/games/nu_pogodi/trunk/kv_lost.png rename to programs/games/nu_pogodi/kv_lost.png diff --git a/programs/games/nu_pogodi/trunk/kv_z_bab.svg b/programs/games/nu_pogodi/kv_z_bab.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/kv_z_bab.svg rename to programs/games/nu_pogodi/kv_z_bab.svg diff --git a/programs/games/nu_pogodi/trunk/kv_z_decor.svg b/programs/games/nu_pogodi/kv_z_decor.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/kv_z_decor.svg rename to programs/games/nu_pogodi/kv_z_decor.svg diff --git a/programs/games/nu_pogodi/trunk/kv_z_lost.svg b/programs/games/nu_pogodi/kv_z_lost.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/kv_z_lost.svg rename to programs/games/nu_pogodi/kv_z_lost.svg diff --git a/programs/games/nu_pogodi/trunk/kv_z_zaba.svg b/programs/games/nu_pogodi/kv_z_zaba.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/kv_z_zaba.svg rename to programs/games/nu_pogodi/kv_z_zaba.svg diff --git a/programs/games/nu_pogodi/trunk/kv_zaba.png b/programs/games/nu_pogodi/kv_zaba.png similarity index 100% rename from programs/games/nu_pogodi/trunk/kv_zaba.png rename to programs/games/nu_pogodi/kv_zaba.png diff --git a/programs/games/nu_pogodi/trunk/kvaka_za.ini b/programs/games/nu_pogodi/kvaka_za.ini similarity index 100% rename from programs/games/nu_pogodi/trunk/kvaka_za.ini rename to programs/games/nu_pogodi/kvaka_za.ini diff --git a/programs/games/nu_pogodi/trunk/kvaka_zadav.svg b/programs/games/nu_pogodi/kvaka_zadav.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/kvaka_zadav.svg rename to programs/games/nu_pogodi/kvaka_zadav.svg diff --git a/programs/games/nu_pogodi/trunk/main.ini b/programs/games/nu_pogodi/main.ini similarity index 100% rename from programs/games/nu_pogodi/trunk/main.ini rename to programs/games/nu_pogodi/main.ini diff --git a/programs/games/nu_pogodi/trunk/nu_p_chi.svg b/programs/games/nu_pogodi/nu_p_chi.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/nu_p_chi.svg rename to programs/games/nu_pogodi/nu_p_chi.svg diff --git a/programs/games/nu_pogodi/trunk/nu_p_curici.svg b/programs/games/nu_pogodi/nu_p_curici.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/nu_p_curici.svg rename to programs/games/nu_pogodi/nu_p_curici.svg diff --git a/programs/games/nu_pogodi/trunk/nu_p_egs.svg b/programs/games/nu_pogodi/nu_p_egs.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/nu_p_egs.svg rename to programs/games/nu_pogodi/nu_p_egs.svg diff --git a/programs/games/nu_pogodi/trunk/nu_p_wolf.svg b/programs/games/nu_pogodi/nu_p_wolf.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/nu_p_wolf.svg rename to programs/games/nu_pogodi/nu_p_wolf.svg diff --git a/programs/games/nu_pogodi/trunk/nu_pogod.asm b/programs/games/nu_pogodi/nu_pogod.asm similarity index 95% rename from programs/games/nu_pogodi/trunk/nu_pogod.asm rename to programs/games/nu_pogodi/nu_pogod.asm index bde9bd6063..f04391434b 100644 --- a/programs/games/nu_pogodi/trunk/nu_pogod.asm +++ b/programs/games/nu_pogodi/nu_pogod.asm @@ -3,12 +3,12 @@ use32 db 'MENUET01' ;¨¤¥­â¨ä. ¨á¯®«­ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â dd 1, start, i_end, mem, stacktop, 0, sys_path -include '../../../macros.inc' -include '../../../proc32.inc' -include '../../../KOSfuncs.inc' -include '../../../load_lib.mac' -include '../../../develop/libraries/box_lib/trunk/box_lib.mac' ;¬ ªà®áë ¤«ï § ¤ ­¨ï í«¥¬¥­â®¢ box_lib -include '../../../dll.inc' +include '../../macros.inc' +include '../../proc32.inc' +include '../../KOSfuncs.inc' +include '../../load_lib.mac' +include '../../develop/libraries/box_lib/trunk/box_lib.mac' ;¬ ªà®áë ¤«ï § ¤ ­¨ï í«¥¬¥­â®¢ box_lib +include '../../dll.inc' @use_library mem.Alloc,mem.Free,mem.ReAlloc, dll.Load diff --git a/programs/games/nu_pogodi/trunk/nu_pogod.ini b/programs/games/nu_pogodi/nu_pogod.ini similarity index 100% rename from programs/games/nu_pogodi/trunk/nu_pogod.ini rename to programs/games/nu_pogodi/nu_pogod.ini diff --git a/programs/games/nu_pogodi/trunk/nu_pogod.svg b/programs/games/nu_pogodi/nu_pogod.svg similarity index 100% rename from programs/games/nu_pogodi/trunk/nu_pogod.svg rename to programs/games/nu_pogodi/nu_pogod.svg diff --git a/programs/games/nu_pogodi/trunk/nu_pogod_n.ini b/programs/games/nu_pogodi/nu_pogod_n.ini similarity index 100% rename from programs/games/nu_pogodi/trunk/nu_pogod_n.ini rename to programs/games/nu_pogodi/nu_pogod_n.ini diff --git a/programs/games/nu_pogodi/trunk/tl_sys_16.png b/programs/games/nu_pogodi/tl_sys_16.png similarity index 100% rename from programs/games/nu_pogodi/trunk/tl_sys_16.png rename to programs/games/nu_pogodi/tl_sys_16.png diff --git a/programs/games/nu_pogodi/trunk/wolf.png b/programs/games/nu_pogodi/wolf.png similarity index 100% rename from programs/games/nu_pogodi/trunk/wolf.png rename to programs/games/nu_pogodi/wolf.png diff --git a/programs/games/phenix/trunk/Tupfile.lua b/programs/games/phenix/Tupfile.lua similarity index 79% rename from programs/games/phenix/trunk/Tupfile.lua rename to programs/games/phenix/Tupfile.lua index 9df9149405..cb3af39195 100644 --- a/programs/games/phenix/trunk/Tupfile.lua +++ b/programs/games/phenix/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/phenix/trunk/ascgl.inc b/programs/games/phenix/ascgl.inc similarity index 100% rename from programs/games/phenix/trunk/ascgl.inc rename to programs/games/phenix/ascgl.inc diff --git a/programs/games/phenix/trunk/ascgml.inc b/programs/games/phenix/ascgml.inc similarity index 100% rename from programs/games/phenix/trunk/ascgml.inc rename to programs/games/phenix/ascgml.inc diff --git a/programs/games/phenix/trunk/ascguil.inc b/programs/games/phenix/ascguil.inc similarity index 100% rename from programs/games/phenix/trunk/ascguil.inc rename to programs/games/phenix/ascguil.inc diff --git a/programs/games/phenix/trunk/ascl.inc b/programs/games/phenix/ascl.inc similarity index 100% rename from programs/games/phenix/trunk/ascl.inc rename to programs/games/phenix/ascl.inc diff --git a/programs/games/phenix/trunk/ascml.inc b/programs/games/phenix/ascml.inc similarity index 100% rename from programs/games/phenix/trunk/ascml.inc rename to programs/games/phenix/ascml.inc diff --git a/programs/games/phenix/trunk/ascpoal.inc b/programs/games/phenix/ascpoal.inc similarity index 100% rename from programs/games/phenix/trunk/ascpoal.inc rename to programs/games/phenix/ascpoal.inc diff --git a/programs/games/phenix/trunk/build_en.bat b/programs/games/phenix/build_en.bat similarity index 100% rename from programs/games/phenix/trunk/build_en.bat rename to programs/games/phenix/build_en.bat diff --git a/programs/games/phenix/trunk/build_ru.bat b/programs/games/phenix/build_ru.bat similarity index 100% rename from programs/games/phenix/trunk/build_ru.bat rename to programs/games/phenix/build_ru.bat diff --git a/programs/games/phenix/trunk/gif_lite.inc b/programs/games/phenix/gif_lite.inc similarity index 100% rename from programs/games/phenix/trunk/gif_lite.inc rename to programs/games/phenix/gif_lite.inc diff --git a/programs/games/phenix/trunk/objects.gif b/programs/games/phenix/objects.gif similarity index 100% rename from programs/games/phenix/trunk/objects.gif rename to programs/games/phenix/objects.gif diff --git a/programs/games/phenix/trunk/phenix.asm b/programs/games/phenix/phenix.asm similarity index 99% rename from programs/games/phenix/trunk/phenix.asm rename to programs/games/phenix/phenix.asm index e2f4372227..f8a4ce43c4 100644 --- a/programs/games/phenix/trunk/phenix.asm +++ b/programs/games/phenix/phenix.asm @@ -15,7 +15,7 @@ ;********************************************************************** include 'lang.inc' ; for SVN 'lang.inc' -include '../../../macros.inc' ; for SVN '..\..\..\macros.inc;' +include '../../macros.inc' ; for SVN '..\..\macros.inc;' include 'ascl.inc' ; main include 'ascgl.inc' ; graphics include 'ascpoal.inc' ; processing object array @@ -1229,4 +1229,4 @@ canvas_end: align 16 stack_max: rb 2048 -I_END: \ No newline at end of file +I_END: diff --git a/programs/games/phenix/trunk/phenix.png b/programs/games/phenix/phenix.png similarity index 100% rename from programs/games/phenix/trunk/phenix.png rename to programs/games/phenix/phenix.png diff --git a/programs/games/pig/trunk/AUTHORS b/programs/games/pig/AUTHORS similarity index 100% rename from programs/games/pig/trunk/AUTHORS rename to programs/games/pig/AUTHORS diff --git a/programs/games/pig/trunk/COPYING b/programs/games/pig/COPYING similarity index 100% rename from programs/games/pig/trunk/COPYING rename to programs/games/pig/COPYING diff --git a/programs/games/pig/trunk/ChangeLog b/programs/games/pig/ChangeLog similarity index 100% rename from programs/games/pig/trunk/ChangeLog rename to programs/games/pig/ChangeLog diff --git a/programs/games/pig/trunk/INSTALL b/programs/games/pig/INSTALL similarity index 100% rename from programs/games/pig/trunk/INSTALL rename to programs/games/pig/INSTALL diff --git a/programs/games/pig/trunk/INSTRUCTIONS b/programs/games/pig/INSTRUCTIONS similarity index 100% rename from programs/games/pig/trunk/INSTRUCTIONS rename to programs/games/pig/INSTRUCTIONS diff --git a/programs/games/pig/trunk/Makefile.am b/programs/games/pig/Makefile.am similarity index 100% rename from programs/games/pig/trunk/Makefile.am rename to programs/games/pig/Makefile.am diff --git a/programs/games/pig/trunk/Makefile.in b/programs/games/pig/Makefile.in similarity index 100% rename from programs/games/pig/trunk/Makefile.in rename to programs/games/pig/Makefile.in diff --git a/programs/games/pig/trunk/NEWS b/programs/games/pig/NEWS similarity index 100% rename from programs/games/pig/trunk/NEWS rename to programs/games/pig/NEWS diff --git a/programs/games/pig/trunk/README b/programs/games/pig/README similarity index 100% rename from programs/games/pig/trunk/README rename to programs/games/pig/README diff --git a/programs/games/pig/trunk/aclocal.m4 b/programs/games/pig/aclocal.m4 similarity index 100% rename from programs/games/pig/trunk/aclocal.m4 rename to programs/games/pig/aclocal.m4 diff --git a/programs/games/pig/trunk/config.guess b/programs/games/pig/config.guess similarity index 100% rename from programs/games/pig/trunk/config.guess rename to programs/games/pig/config.guess diff --git a/programs/games/pig/trunk/config.sub b/programs/games/pig/config.sub similarity index 100% rename from programs/games/pig/trunk/config.sub rename to programs/games/pig/config.sub diff --git a/programs/games/pig/trunk/configure b/programs/games/pig/configure similarity index 100% rename from programs/games/pig/trunk/configure rename to programs/games/pig/configure diff --git a/programs/games/pig/trunk/configure.in b/programs/games/pig/configure.in similarity index 100% rename from programs/games/pig/trunk/configure.in rename to programs/games/pig/configure.in diff --git a/programs/games/pig/trunk/depcomp b/programs/games/pig/depcomp similarity index 100% rename from programs/games/pig/trunk/depcomp rename to programs/games/pig/depcomp diff --git a/programs/games/pig/trunk/dirty.c b/programs/games/pig/dirty.c similarity index 100% rename from programs/games/pig/trunk/dirty.c rename to programs/games/pig/dirty.c diff --git a/programs/games/pig/trunk/dirty.h b/programs/games/pig/dirty.h similarity index 100% rename from programs/games/pig/trunk/dirty.h rename to programs/games/pig/dirty.h diff --git a/programs/games/pig/trunk/dirtyrects.txt b/programs/games/pig/dirtyrects.txt similarity index 100% rename from programs/games/pig/trunk/dirtyrects.txt rename to programs/games/pig/dirtyrects.txt diff --git a/programs/games/pig/trunk/engine.c b/programs/games/pig/engine.c similarity index 100% rename from programs/games/pig/trunk/engine.c rename to programs/games/pig/engine.c diff --git a/programs/games/pig/trunk/engine.h b/programs/games/pig/engine.h similarity index 100% rename from programs/games/pig/trunk/engine.h rename to programs/games/pig/engine.h diff --git a/programs/games/pig/trunk/evil.png b/programs/games/pig/evil.png similarity index 100% rename from programs/games/pig/trunk/evil.png rename to programs/games/pig/evil.png diff --git a/programs/games/pig/trunk/font.png b/programs/games/pig/font.png similarity index 100% rename from programs/games/pig/trunk/font.png rename to programs/games/pig/font.png diff --git a/programs/games/pig/trunk/glassfont.png b/programs/games/pig/glassfont.png similarity index 100% rename from programs/games/pig/trunk/glassfont.png rename to programs/games/pig/glassfont.png diff --git a/programs/games/pig/trunk/icons.png b/programs/games/pig/icons.png similarity index 100% rename from programs/games/pig/trunk/icons.png rename to programs/games/pig/icons.png diff --git a/programs/games/pig/trunk/install-sh b/programs/games/pig/install-sh similarity index 100% rename from programs/games/pig/trunk/install-sh rename to programs/games/pig/install-sh diff --git a/programs/games/pig/trunk/lifepig.png b/programs/games/pig/lifepig.png similarity index 100% rename from programs/games/pig/trunk/lifepig.png rename to programs/games/pig/lifepig.png diff --git a/programs/games/pig/trunk/missing b/programs/games/pig/missing similarity index 100% rename from programs/games/pig/trunk/missing rename to programs/games/pig/missing diff --git a/programs/games/pig/trunk/mkinstalldirs b/programs/games/pig/mkinstalldirs similarity index 100% rename from programs/games/pig/trunk/mkinstalldirs rename to programs/games/pig/mkinstalldirs diff --git a/programs/games/pig/trunk/pig-linux-x86 b/programs/games/pig/pig-linux-x86 similarity index 100% rename from programs/games/pig/trunk/pig-linux-x86 rename to programs/games/pig/pig-linux-x86 diff --git a/programs/games/pig/trunk/pig.c b/programs/games/pig/pig.c similarity index 100% rename from programs/games/pig/trunk/pig.c rename to programs/games/pig/pig.c diff --git a/programs/games/pig/trunk/pigframes.png b/programs/games/pig/pigframes.png similarity index 100% rename from programs/games/pig/trunk/pigframes.png rename to programs/games/pig/pigframes.png diff --git a/programs/games/pig/trunk/slime.png b/programs/games/pig/slime.png similarity index 100% rename from programs/games/pig/trunk/slime.png rename to programs/games/pig/slime.png diff --git a/programs/games/pig/trunk/stars.png b/programs/games/pig/stars.png similarity index 100% rename from programs/games/pig/trunk/stars.png rename to programs/games/pig/stars.png diff --git a/programs/games/pig/trunk/tiles.png b/programs/games/pig/tiles.png similarity index 100% rename from programs/games/pig/trunk/tiles.png rename to programs/games/pig/tiles.png diff --git a/programs/games/pong/trunk/Tupfile.lua b/programs/games/pong/Tupfile.lua similarity index 79% rename from programs/games/pong/trunk/Tupfile.lua rename to programs/games/pong/Tupfile.lua index c885a05927..a4e1409cea 100644 --- a/programs/games/pong/trunk/Tupfile.lua +++ b/programs/games/pong/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/pong/trunk/ball.raw b/programs/games/pong/ball.raw similarity index 100% rename from programs/games/pong/trunk/ball.raw rename to programs/games/pong/ball.raw diff --git a/programs/games/pong/trunk/build_en.bat b/programs/games/pong/build_en.bat similarity index 100% rename from programs/games/pong/trunk/build_en.bat rename to programs/games/pong/build_en.bat diff --git a/programs/games/pong/trunk/build_ru.bat b/programs/games/pong/build_ru.bat similarity index 100% rename from programs/games/pong/trunk/build_ru.bat rename to programs/games/pong/build_ru.bat diff --git a/programs/games/pong/trunk/english.inc b/programs/games/pong/english.inc similarity index 100% rename from programs/games/pong/trunk/english.inc rename to programs/games/pong/english.inc diff --git a/programs/games/pong/trunk/paddle.raw b/programs/games/pong/paddle.raw similarity index 100% rename from programs/games/pong/trunk/paddle.raw rename to programs/games/pong/paddle.raw diff --git a/programs/games/pong/trunk/pong.asm b/programs/games/pong/pong.asm similarity index 99% rename from programs/games/pong/trunk/pong.asm rename to programs/games/pong/pong.asm index e221633267..1df76d727a 100644 --- a/programs/games/pong/trunk/pong.asm +++ b/programs/games/pong/pong.asm @@ -32,7 +32,7 @@ use32 dd 0 -include '../../../macros.inc' +include '../../macros.inc' START: diff --git a/programs/games/pong/trunk/russian.inc b/programs/games/pong/russian.inc similarity index 100% rename from programs/games/pong/trunk/russian.inc rename to programs/games/pong/russian.inc diff --git a/programs/games/pong3/trunk/Tupfile.lua b/programs/games/pong3/Tupfile.lua similarity index 100% rename from programs/games/pong3/trunk/Tupfile.lua rename to programs/games/pong3/Tupfile.lua diff --git a/programs/games/pong3/trunk/ascgl.inc b/programs/games/pong3/ascgl.inc similarity index 100% rename from programs/games/pong3/trunk/ascgl.inc rename to programs/games/pong3/ascgl.inc diff --git a/programs/games/pong3/trunk/ascgml.inc b/programs/games/pong3/ascgml.inc similarity index 100% rename from programs/games/pong3/trunk/ascgml.inc rename to programs/games/pong3/ascgml.inc diff --git a/programs/games/pong3/trunk/ascl.inc b/programs/games/pong3/ascl.inc similarity index 100% rename from programs/games/pong3/trunk/ascl.inc rename to programs/games/pong3/ascl.inc diff --git a/programs/games/pong3/trunk/build_en.bat b/programs/games/pong3/build_en.bat similarity index 100% rename from programs/games/pong3/trunk/build_en.bat rename to programs/games/pong3/build_en.bat diff --git a/programs/games/pong3/trunk/build_ru.bat b/programs/games/pong3/build_ru.bat similarity index 100% rename from programs/games/pong3/trunk/build_ru.bat rename to programs/games/pong3/build_ru.bat diff --git a/programs/games/pong3/trunk/pong.bmp b/programs/games/pong3/pong.bmp similarity index 100% rename from programs/games/pong3/trunk/pong.bmp rename to programs/games/pong3/pong.bmp diff --git a/programs/games/pong3/trunk/pong3.asm b/programs/games/pong3/pong3.asm similarity index 99% rename from programs/games/pong3/trunk/pong3.asm rename to programs/games/pong3/pong3.asm index bb69d0fd40..f67adac794 100644 --- a/programs/games/pong3/trunk/pong3.asm +++ b/programs/games/pong3/pong3.asm @@ -19,7 +19,7 @@ format binary as "" ;****************************************************************************** -include '..\..\..\macros.inc' +include '..\..\macros.inc' include 'ascl.inc' include 'ascgl.inc' include 'ascgml.inc' diff --git a/programs/games/reversi/trunk/Makefile b/programs/games/reversi/Makefile similarity index 100% rename from programs/games/reversi/trunk/Makefile rename to programs/games/reversi/Makefile diff --git a/programs/games/reversi/trunk/Tupfile.lua b/programs/games/reversi/Tupfile.lua similarity index 65% rename from programs/games/reversi/trunk/Tupfile.lua rename to programs/games/reversi/Tupfile.lua index a4c44a4a75..51b37e0700 100644 --- a/programs/games/reversi/trunk/Tupfile.lua +++ b/programs/games/reversi/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig('NO_GCC') ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_gcc.lua") tup.include(HELPERDIR .. "/use_menuetlibc.lua") compile_gcc{"reversi.c"} diff --git a/programs/games/reversi/trunk/reversi.c b/programs/games/reversi/reversi.c similarity index 100% rename from programs/games/reversi/trunk/reversi.c rename to programs/games/reversi/reversi.c diff --git a/programs/games/rforces/trunk/KosFile.h b/programs/games/rforces/KosFile.h similarity index 100% rename from programs/games/rforces/trunk/KosFile.h rename to programs/games/rforces/KosFile.h diff --git a/programs/games/rforces/trunk/Tupfile.lua b/programs/games/rforces/Tupfile.lua similarity index 70% rename from programs/games/rforces/trunk/Tupfile.lua rename to programs/games/rforces/Tupfile.lua index ea6c5ca3b5..ee51f851dd 100644 --- a/programs/games/rforces/trunk/Tupfile.lua +++ b/programs/games/rforces/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_MSVC") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_msvc.lua") compile_msvc{"rforces.cpp", "kosFile.cpp", "kosSyst.cpp", "mcsmemm.cpp"} link_msvc("rforces") diff --git a/programs/games/rforces/trunk/cmp.bat b/programs/games/rforces/cmp.bat similarity index 100% rename from programs/games/rforces/trunk/cmp.bat rename to programs/games/rforces/cmp.bat diff --git a/programs/games/rforces/trunk/kosFile.cpp b/programs/games/rforces/kosFile.cpp similarity index 100% rename from programs/games/rforces/trunk/kosFile.cpp rename to programs/games/rforces/kosFile.cpp diff --git a/programs/games/rforces/trunk/kosSyst.cpp b/programs/games/rforces/kosSyst.cpp similarity index 100% rename from programs/games/rforces/trunk/kosSyst.cpp rename to programs/games/rforces/kosSyst.cpp diff --git a/programs/games/rforces/trunk/kosSyst.h b/programs/games/rforces/kosSyst.h similarity index 100% rename from programs/games/rforces/trunk/kosSyst.h rename to programs/games/rforces/kosSyst.h diff --git a/programs/games/rforces/trunk/mcsmemm.cpp b/programs/games/rforces/mcsmemm.cpp similarity index 100% rename from programs/games/rforces/trunk/mcsmemm.cpp rename to programs/games/rforces/mcsmemm.cpp diff --git a/programs/games/rforces/trunk/mcsmemm.h b/programs/games/rforces/mcsmemm.h similarity index 100% rename from programs/games/rforces/trunk/mcsmemm.h rename to programs/games/rforces/mcsmemm.h diff --git a/programs/games/rforces/trunk/mymath.h b/programs/games/rforces/mymath.h similarity index 100% rename from programs/games/rforces/trunk/mymath.h rename to programs/games/rforces/mymath.h diff --git a/programs/games/rforces/trunk/objects.h b/programs/games/rforces/objects.h similarity index 100% rename from programs/games/rforces/trunk/objects.h rename to programs/games/rforces/objects.h diff --git a/programs/games/rforces/trunk/properties.h b/programs/games/rforces/properties.h similarity index 100% rename from programs/games/rforces/trunk/properties.h rename to programs/games/rforces/properties.h diff --git a/programs/games/rforces/trunk/rforces.cpp b/programs/games/rforces/rforces.cpp similarity index 100% rename from programs/games/rforces/trunk/rforces.cpp rename to programs/games/rforces/rforces.cpp diff --git a/programs/games/rforces/trunk/rforces.h b/programs/games/rforces/rforces.h similarity index 100% rename from programs/games/rforces/trunk/rforces.h rename to programs/games/rforces/rforces.h diff --git a/programs/games/rsquare/trunk/Tupfile.lua b/programs/games/rsquare/Tupfile.lua similarity index 70% rename from programs/games/rsquare/trunk/Tupfile.lua rename to programs/games/rsquare/Tupfile.lua index 94a21d9c70..6cf1ea2b25 100644 --- a/programs/games/rsquare/trunk/Tupfile.lua +++ b/programs/games/rsquare/Tupfile.lua @@ -1,4 +1,4 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") tup.rule("rsquare.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "rsquare") diff --git a/programs/games/rsquare/trunk/build_en.bat b/programs/games/rsquare/build_en.bat similarity index 100% rename from programs/games/rsquare/trunk/build_en.bat rename to programs/games/rsquare/build_en.bat diff --git a/programs/games/rsquare/trunk/build_ru.bat b/programs/games/rsquare/build_ru.bat similarity index 100% rename from programs/games/rsquare/trunk/build_ru.bat rename to programs/games/rsquare/build_ru.bat diff --git a/programs/games/rsquare/trunk/rlevels.bin b/programs/games/rsquare/rlevels.bin similarity index 100% rename from programs/games/rsquare/trunk/rlevels.bin rename to programs/games/rsquare/rlevels.bin diff --git a/programs/games/rsquare/trunk/rsquare.asm b/programs/games/rsquare/rsquare.asm similarity index 100% rename from programs/games/rsquare/trunk/rsquare.asm rename to programs/games/rsquare/rsquare.asm diff --git a/programs/games/snake/trunk/Tupfile.lua b/programs/games/snake/Tupfile.lua similarity index 100% rename from programs/games/snake/trunk/Tupfile.lua rename to programs/games/snake/Tupfile.lua diff --git a/programs/games/snake/trunk/build_en.bat b/programs/games/snake/build_en.bat similarity index 100% rename from programs/games/snake/trunk/build_en.bat rename to programs/games/snake/build_en.bat diff --git a/programs/games/snake/trunk/first_menu.asm b/programs/games/snake/first_menu.asm similarity index 100% rename from programs/games/snake/trunk/first_menu.asm rename to programs/games/snake/first_menu.asm diff --git a/programs/games/snake/trunk/game_over.asm b/programs/games/snake/game_over.asm similarity index 100% rename from programs/games/snake/trunk/game_over.asm rename to programs/games/snake/game_over.asm diff --git a/programs/games/snake/trunk/level.asm b/programs/games/snake/level.asm similarity index 100% rename from programs/games/snake/trunk/level.asm rename to programs/games/snake/level.asm diff --git a/programs/games/snake/trunk/makefile b/programs/games/snake/makefile similarity index 100% rename from programs/games/snake/trunk/makefile rename to programs/games/snake/makefile diff --git a/programs/games/snake/trunk/pause.asm b/programs/games/snake/pause.asm similarity index 100% rename from programs/games/snake/trunk/pause.asm rename to programs/games/snake/pause.asm diff --git a/programs/games/snake/trunk/snake.asm b/programs/games/snake/snake.asm similarity index 97% rename from programs/games/snake/trunk/snake.asm rename to programs/games/snake/snake.asm index 66b47de976..bd46ce0fa8 100644 --- a/programs/games/snake/trunk/snake.asm +++ b/programs/games/snake/snake.asm @@ -7,11 +7,11 @@ use32 ;;---HEADER-------------------------------------------------------------------------------------------------------------------- -include '../../../proc32.inc' -include '../../../macros.inc' -include '../../../dll.inc' -include '../../../develop/libraries/box_lib/trunk/box_lib.mac' -;include '../../../system/board/trunk/debug.inc' +include '../../proc32.inc' +include '../../macros.inc' +include '../../dll.inc' +include '../../develop/libraries/box_lib/trunk/box_lib.mac' +;include '../../system/board/trunk/debug.inc' ;;===Define_chapter============================================================================================================ diff --git a/programs/games/snake/trunk/snake.ini b/programs/games/snake/snake.ini similarity index 100% rename from programs/games/snake/trunk/snake.ini rename to programs/games/snake/snake.ini diff --git a/programs/games/soko/trunk/100BOXES.LEV b/programs/games/soko/100BOXES.LEV similarity index 100% rename from programs/games/soko/trunk/100BOXES.LEV rename to programs/games/soko/100BOXES.LEV diff --git a/programs/games/soko/trunk/990602.LEV b/programs/games/soko/990602.LEV similarity index 100% rename from programs/games/soko/trunk/990602.LEV rename to programs/games/soko/990602.LEV diff --git a/programs/games/soko/trunk/AENIGMA.LEV b/programs/games/soko/AENIGMA.LEV similarity index 100% rename from programs/games/soko/trunk/AENIGMA.LEV rename to programs/games/soko/AENIGMA.LEV diff --git a/programs/games/soko/trunk/ALBG-BST.LEV b/programs/games/soko/ALBG-BST.LEV similarity index 100% rename from programs/games/soko/trunk/ALBG-BST.LEV rename to programs/games/soko/ALBG-BST.LEV diff --git a/programs/games/soko/trunk/ALBG1-1.LEV b/programs/games/soko/ALBG1-1.LEV similarity index 100% rename from programs/games/soko/trunk/ALBG1-1.LEV rename to programs/games/soko/ALBG1-1.LEV diff --git a/programs/games/soko/trunk/ALBG1-2.LEV b/programs/games/soko/ALBG1-2.LEV similarity index 100% rename from programs/games/soko/trunk/ALBG1-2.LEV rename to programs/games/soko/ALBG1-2.LEV diff --git a/programs/games/soko/trunk/ALBG1-3.LEV b/programs/games/soko/ALBG1-3.LEV similarity index 100% rename from programs/games/soko/trunk/ALBG1-3.LEV rename to programs/games/soko/ALBG1-3.LEV diff --git a/programs/games/soko/trunk/AUTOGEN.LEV b/programs/games/soko/AUTOGEN.LEV similarity index 100% rename from programs/games/soko/trunk/AUTOGEN.LEV rename to programs/games/soko/AUTOGEN.LEV diff --git a/programs/games/soko/trunk/BAGLE.LEV b/programs/games/soko/BAGLE.LEV similarity index 100% rename from programs/games/soko/trunk/BAGLE.LEV rename to programs/games/soko/BAGLE.LEV diff --git a/programs/games/soko/trunk/BAGLE2.LEV b/programs/games/soko/BAGLE2.LEV similarity index 100% rename from programs/games/soko/trunk/BAGLE2.LEV rename to programs/games/soko/BAGLE2.LEV diff --git a/programs/games/soko/trunk/BOXXLE1.LEV b/programs/games/soko/BOXXLE1.LEV similarity index 100% rename from programs/games/soko/trunk/BOXXLE1.LEV rename to programs/games/soko/BOXXLE1.LEV diff --git a/programs/games/soko/trunk/BOXXLE2.LEV b/programs/games/soko/BOXXLE2.LEV similarity index 100% rename from programs/games/soko/trunk/BOXXLE2.LEV rename to programs/games/soko/BOXXLE2.LEV diff --git a/programs/games/soko/trunk/CANTRIP.LEV b/programs/games/soko/CANTRIP.LEV similarity index 100% rename from programs/games/soko/trunk/CANTRIP.LEV rename to programs/games/soko/CANTRIP.LEV diff --git a/programs/games/soko/trunk/CANTRIP2.LEV b/programs/games/soko/CANTRIP2.LEV similarity index 100% rename from programs/games/soko/trunk/CANTRIP2.LEV rename to programs/games/soko/CANTRIP2.LEV diff --git a/programs/games/soko/trunk/CELLTYPE.INC b/programs/games/soko/CELLTYPE.INC similarity index 100% rename from programs/games/soko/trunk/CELLTYPE.INC rename to programs/games/soko/CELLTYPE.INC diff --git a/programs/games/soko/trunk/CNF b/programs/games/soko/CNF similarity index 100% rename from programs/games/soko/trunk/CNF rename to programs/games/soko/CNF diff --git a/programs/games/soko/trunk/CNF.ASM b/programs/games/soko/CNF.ASM similarity index 100% rename from programs/games/soko/trunk/CNF.ASM rename to programs/games/soko/CNF.ASM diff --git a/programs/games/soko/trunk/DH1.LEV b/programs/games/soko/DH1.LEV similarity index 100% rename from programs/games/soko/trunk/DH1.LEV rename to programs/games/soko/DH1.LEV diff --git a/programs/games/soko/trunk/DH2.LEV b/programs/games/soko/DH2.LEV similarity index 100% rename from programs/games/soko/trunk/DH2.LEV rename to programs/games/soko/DH2.LEV diff --git a/programs/games/soko/trunk/DIM-YORK.LEV b/programs/games/soko/DIM-YORK.LEV similarity index 100% rename from programs/games/soko/trunk/DIM-YORK.LEV rename to programs/games/soko/DIM-YORK.LEV diff --git a/programs/games/soko/trunk/ERIM.LEV b/programs/games/soko/ERIM.LEV similarity index 100% rename from programs/games/soko/trunk/ERIM.LEV rename to programs/games/soko/ERIM.LEV diff --git a/programs/games/soko/trunk/FPOK.LEV b/programs/games/soko/FPOK.LEV similarity index 100% rename from programs/games/soko/trunk/FPOK.LEV rename to programs/games/soko/FPOK.LEV diff --git a/programs/games/soko/trunk/GRIG2001.LEV b/programs/games/soko/GRIG2001.LEV similarity index 100% rename from programs/games/soko/trunk/GRIG2001.LEV rename to programs/games/soko/GRIG2001.LEV diff --git a/programs/games/soko/trunk/GRIG2002.LEV b/programs/games/soko/GRIG2002.LEV similarity index 100% rename from programs/games/soko/trunk/GRIG2002.LEV rename to programs/games/soko/GRIG2002.LEV diff --git a/programs/games/soko/trunk/HANDMADE.LEV b/programs/games/soko/HANDMADE.LEV similarity index 100% rename from programs/games/soko/trunk/HANDMADE.LEV rename to programs/games/soko/HANDMADE.LEV diff --git a/programs/games/soko/trunk/HEYTAK.LEV b/programs/games/soko/HEYTAK.LEV similarity index 100% rename from programs/games/soko/trunk/HEYTAK.LEV rename to programs/games/soko/HEYTAK.LEV diff --git a/programs/games/soko/trunk/HOWARD1.LEV b/programs/games/soko/HOWARD1.LEV similarity index 100% rename from programs/games/soko/trunk/HOWARD1.LEV rename to programs/games/soko/HOWARD1.LEV diff --git a/programs/games/soko/trunk/HOWARD2.LEV b/programs/games/soko/HOWARD2.LEV similarity index 100% rename from programs/games/soko/trunk/HOWARD2.LEV rename to programs/games/soko/HOWARD2.LEV diff --git a/programs/games/soko/trunk/HOWARD3.LEV b/programs/games/soko/HOWARD3.LEV similarity index 100% rename from programs/games/soko/trunk/HOWARD3.LEV rename to programs/games/soko/HOWARD3.LEV diff --git a/programs/games/soko/trunk/HOWARD4.LEV b/programs/games/soko/HOWARD4.LEV similarity index 100% rename from programs/games/soko/trunk/HOWARD4.LEV rename to programs/games/soko/HOWARD4.LEV diff --git a/programs/games/soko/trunk/JCD.LEV b/programs/games/soko/JCD.LEV similarity index 100% rename from programs/games/soko/trunk/JCD.LEV rename to programs/games/soko/JCD.LEV diff --git a/programs/games/soko/trunk/JCT.LEV b/programs/games/soko/JCT.LEV similarity index 100% rename from programs/games/soko/trunk/JCT.LEV rename to programs/games/soko/JCT.LEV diff --git a/programs/games/soko/trunk/KOKOBAN.LEV b/programs/games/soko/KOKOBAN.LEV similarity index 100% rename from programs/games/soko/trunk/KOKOBAN.LEV rename to programs/games/soko/KOKOBAN.LEV diff --git a/programs/games/soko/trunk/KOMPACT.LEV b/programs/games/soko/KOMPACT.LEV similarity index 100% rename from programs/games/soko/trunk/KOMPACT.LEV rename to programs/games/soko/KOMPACT.LEV diff --git a/programs/games/soko/trunk/LOMA.LEV b/programs/games/soko/LOMA.LEV similarity index 100% rename from programs/games/soko/trunk/LOMA.LEV rename to programs/games/soko/LOMA.LEV diff --git a/programs/games/soko/trunk/MAELSTRM.LEV b/programs/games/soko/MAELSTRM.LEV similarity index 100% rename from programs/games/soko/trunk/MAELSTRM.LEV rename to programs/games/soko/MAELSTRM.LEV diff --git a/programs/games/soko/trunk/MARIOB.LEV b/programs/games/soko/MARIOB.LEV similarity index 100% rename from programs/games/soko/trunk/MARIOB.LEV rename to programs/games/soko/MARIOB.LEV diff --git a/programs/games/soko/trunk/MASMICRO.LEV b/programs/games/soko/MASMICRO.LEV similarity index 100% rename from programs/games/soko/trunk/MASMICRO.LEV rename to programs/games/soko/MASMICRO.LEV diff --git a/programs/games/soko/trunk/MASSASQ.LEV b/programs/games/soko/MASSASQ.LEV similarity index 100% rename from programs/games/soko/trunk/MASSASQ.LEV rename to programs/games/soko/MASSASQ.LEV diff --git a/programs/games/soko/trunk/MICRCOSM.LEV b/programs/games/soko/MICRCOSM.LEV similarity index 100% rename from programs/games/soko/trunk/MICRCOSM.LEV rename to programs/games/soko/MICRCOSM.LEV diff --git a/programs/games/soko/trunk/MICROBAN.LEV b/programs/games/soko/MICROBAN.LEV similarity index 100% rename from programs/games/soko/trunk/MICROBAN.LEV rename to programs/games/soko/MICROBAN.LEV diff --git a/programs/games/soko/trunk/MINICOSM.LEV b/programs/games/soko/MINICOSM.LEV similarity index 100% rename from programs/games/soko/trunk/MINICOSM.LEV rename to programs/games/soko/MINICOSM.LEV diff --git a/programs/games/soko/trunk/NABOCOSM.LEV b/programs/games/soko/NABOCOSM.LEV similarity index 100% rename from programs/games/soko/trunk/NABOCOSM.LEV rename to programs/games/soko/NABOCOSM.LEV diff --git a/programs/games/soko/trunk/NOVOBAN.LEV b/programs/games/soko/NOVOBAN.LEV similarity index 100% rename from programs/games/soko/trunk/NOVOBAN.LEV rename to programs/games/soko/NOVOBAN.LEV diff --git a/programs/games/soko/trunk/NUMBERS.LEV b/programs/games/soko/NUMBERS.LEV similarity index 100% rename from programs/games/soko/trunk/NUMBERS.LEV rename to programs/games/soko/NUMBERS.LEV diff --git a/programs/games/soko/trunk/ONLINE.LEV b/programs/games/soko/ONLINE.LEV similarity index 100% rename from programs/games/soko/trunk/ONLINE.LEV rename to programs/games/soko/ONLINE.LEV diff --git a/programs/games/soko/trunk/ORIGINAL.LEV b/programs/games/soko/ORIGINAL.LEV similarity index 100% rename from programs/games/soko/trunk/ORIGINAL.LEV rename to programs/games/soko/ORIGINAL.LEV diff --git a/programs/games/soko/trunk/PICOCOSM.LEV b/programs/games/soko/PICOCOSM.LEV similarity index 100% rename from programs/games/soko/trunk/PICOCOSM.LEV rename to programs/games/soko/PICOCOSM.LEV diff --git a/programs/games/soko/trunk/RULES.TXT b/programs/games/soko/RULES.TXT similarity index 100% rename from programs/games/soko/trunk/RULES.TXT rename to programs/games/soko/RULES.TXT diff --git a/programs/games/soko/trunk/SASQ_.LEV b/programs/games/soko/SASQ_.LEV similarity index 100% rename from programs/games/soko/trunk/SASQ_.LEV rename to programs/games/soko/SASQ_.LEV diff --git a/programs/games/soko/trunk/SASQ_III.LEV b/programs/games/soko/SASQ_III.LEV similarity index 100% rename from programs/games/soko/trunk/SASQ_III.LEV rename to programs/games/soko/SASQ_III.LEV diff --git a/programs/games/soko/trunk/SASQ_IV.LEV b/programs/games/soko/SASQ_IV.LEV similarity index 100% rename from programs/games/soko/trunk/SASQ_IV.LEV rename to programs/games/soko/SASQ_IV.LEV diff --git a/programs/games/soko/trunk/SASQ_V.LEV b/programs/games/soko/SASQ_V.LEV similarity index 100% rename from programs/games/soko/trunk/SASQ_V.LEV rename to programs/games/soko/SASQ_V.LEV diff --git a/programs/games/soko/trunk/SASQ_VI.LEV b/programs/games/soko/SASQ_VI.LEV similarity index 100% rename from programs/games/soko/trunk/SASQ_VI.LEV rename to programs/games/soko/SASQ_VI.LEV diff --git a/programs/games/soko/trunk/SIMPLE.LEV b/programs/games/soko/SIMPLE.LEV similarity index 100% rename from programs/games/soko/trunk/SIMPLE.LEV rename to programs/games/soko/SIMPLE.LEV diff --git a/programs/games/soko/trunk/SKIN.RAW b/programs/games/soko/SKIN.RAW similarity index 100% rename from programs/games/soko/trunk/SKIN.RAW rename to programs/games/soko/SKIN.RAW diff --git a/programs/games/soko/trunk/SOKEVO.LEV b/programs/games/soko/SOKEVO.LEV similarity index 100% rename from programs/games/soko/trunk/SOKEVO.LEV rename to programs/games/soko/SOKEVO.LEV diff --git a/programs/games/soko/trunk/SOKHARD.LEV b/programs/games/soko/SOKHARD.LEV similarity index 100% rename from programs/games/soko/trunk/SOKHARD.LEV rename to programs/games/soko/SOKHARD.LEV diff --git a/programs/games/soko/trunk/SOKO-4.LEV b/programs/games/soko/SOKO-4.LEV similarity index 100% rename from programs/games/soko/trunk/SOKO-4.LEV rename to programs/games/soko/SOKO-4.LEV diff --git a/programs/games/soko/trunk/SOKO-5.LEV b/programs/games/soko/SOKO-5.LEV similarity index 100% rename from programs/games/soko/trunk/SOKO-5.LEV rename to programs/games/soko/SOKO-5.LEV diff --git a/programs/games/soko/trunk/SOKO-6.LEV b/programs/games/soko/SOKO-6.LEV similarity index 100% rename from programs/games/soko/trunk/SOKO-6.LEV rename to programs/games/soko/SOKO-6.LEV diff --git a/programs/games/soko/trunk/SOKO-7.LEV b/programs/games/soko/SOKO-7.LEV similarity index 100% rename from programs/games/soko/trunk/SOKO-7.LEV rename to programs/games/soko/SOKO-7.LEV diff --git a/programs/games/soko/trunk/SOKO-8.LEV b/programs/games/soko/SOKO-8.LEV similarity index 100% rename from programs/games/soko/trunk/SOKO-8.LEV rename to programs/games/soko/SOKO-8.LEV diff --git a/programs/games/soko/trunk/SOKO-9.LEV b/programs/games/soko/SOKO-9.LEV similarity index 100% rename from programs/games/soko/trunk/SOKO-9.LEV rename to programs/games/soko/SOKO-9.LEV diff --git a/programs/games/soko/trunk/SOKO.ASM b/programs/games/soko/SOKO.ASM similarity index 100% rename from programs/games/soko/trunk/SOKO.ASM rename to programs/games/soko/SOKO.ASM diff --git a/programs/games/soko/trunk/SOKOLATE.LEV b/programs/games/soko/SOKOLATE.LEV similarity index 100% rename from programs/games/soko/trunk/SOKOLATE.LEV rename to programs/games/soko/SOKOLATE.LEV diff --git a/programs/games/soko/trunk/SOLOBAN.LEV b/programs/games/soko/SOLOBAN.LEV similarity index 100% rename from programs/games/soko/trunk/SOLOBAN.LEV rename to programs/games/soko/SOLOBAN.LEV diff --git a/programs/games/soko/trunk/STILMORE.LEV b/programs/games/soko/STILMORE.LEV similarity index 100% rename from programs/games/soko/trunk/STILMORE.LEV rename to programs/games/soko/STILMORE.LEV diff --git a/programs/games/soko/trunk/SVEN.LEV b/programs/games/soko/SVEN.LEV similarity index 100% rename from programs/games/soko/trunk/SVEN.LEV rename to programs/games/soko/SVEN.LEV diff --git a/programs/games/soko/trunk/TAKAKEN.LEV b/programs/games/soko/TAKAKEN.LEV similarity index 100% rename from programs/games/soko/trunk/TAKAKEN.LEV rename to programs/games/soko/TAKAKEN.LEV diff --git a/programs/games/soko/trunk/TITLSCRN.LEV b/programs/games/soko/TITLSCRN.LEV similarity index 100% rename from programs/games/soko/trunk/TITLSCRN.LEV rename to programs/games/soko/TITLSCRN.LEV diff --git a/programs/games/soko/trunk/TWISTY.LEV b/programs/games/soko/TWISTY.LEV similarity index 100% rename from programs/games/soko/trunk/TWISTY.LEV rename to programs/games/soko/TWISTY.LEV diff --git a/programs/games/soko/trunk/Tupfile.lua b/programs/games/soko/Tupfile.lua similarity index 69% rename from programs/games/soko/trunk/Tupfile.lua rename to programs/games/soko/Tupfile.lua index 10b33dc740..fba8ae532c 100644 --- a/programs/games/soko/trunk/Tupfile.lua +++ b/programs/games/soko/Tupfile.lua @@ -1,4 +1,4 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") tup.rule("SOKO.ASM", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "SOKO") diff --git a/programs/games/sq_game/trunk/SQ_GAME.ASM b/programs/games/sq_game/SQ_GAME.ASM similarity index 98% rename from programs/games/sq_game/trunk/SQ_GAME.ASM rename to programs/games/sq_game/SQ_GAME.ASM index ea697fe248..6e8c8bdad4 100644 --- a/programs/games/sq_game/trunk/SQ_GAME.ASM +++ b/programs/games/sq_game/SQ_GAME.ASM @@ -31,7 +31,7 @@ dd 0x0 ;  ¤à¥á ¡ãä¥à  ¤«ï ¯ à ¬¥â஢ (­¥ ¨á¯®«ì§ã¥âáï) dd 0x0 ; § à¥§¥à¢¨à®¢ ­® -include '../../../macros.inc' ; ¬ ªà®áë ®¡«¥£ç îâ ¦¨§­ì  áᥬ¡«¥à騪®¢! +include '../../macros.inc' ; ¬ ªà®áë ®¡«¥£ç îâ ¦¨§­ì  áᥬ¡«¥à騪®¢! ; Language support for locales: ru_RU (CP866), en_US. diff --git a/programs/games/sq_game/trunk/Tupfile.lua b/programs/games/sq_game/Tupfile.lua similarity index 70% rename from programs/games/sq_game/trunk/Tupfile.lua rename to programs/games/sq_game/Tupfile.lua index 45be789c5a..7485e69b03 100644 --- a/programs/games/sq_game/trunk/Tupfile.lua +++ b/programs/games/sq_game/Tupfile.lua @@ -1,4 +1,4 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") tup.rule("SQ_GAME.ASM", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o " .. tup.getconfig("KPACK_CMD"), "SQ_GAME") diff --git a/programs/games/sq_game/trunk/build_en.bat b/programs/games/sq_game/build_en.bat similarity index 100% rename from programs/games/sq_game/trunk/build_en.bat rename to programs/games/sq_game/build_en.bat diff --git a/programs/games/sq_game/trunk/build_ru.bat b/programs/games/sq_game/build_ru.bat similarity index 100% rename from programs/games/sq_game/trunk/build_ru.bat rename to programs/games/sq_game/build_ru.bat diff --git a/programs/games/sudoku/trunk/SudokuSolve.pas b/programs/games/sudoku/SudokuSolve.pas similarity index 100% rename from programs/games/sudoku/trunk/SudokuSolve.pas rename to programs/games/sudoku/SudokuSolve.pas diff --git a/programs/games/sudoku/trunk/Tupfile.lua b/programs/games/sudoku/Tupfile.lua similarity index 79% rename from programs/games/sudoku/trunk/Tupfile.lua rename to programs/games/sudoku/Tupfile.lua index 72a550bc56..c8d1a2c023 100644 --- a/programs/games/sudoku/trunk/Tupfile.lua +++ b/programs/games/sudoku/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/sudoku/trunk/build_en.bat b/programs/games/sudoku/build_en.bat similarity index 100% rename from programs/games/sudoku/trunk/build_en.bat rename to programs/games/sudoku/build_en.bat diff --git a/programs/games/sudoku/trunk/editbox_ex.mac b/programs/games/sudoku/editbox_ex.mac similarity index 100% rename from programs/games/sudoku/trunk/editbox_ex.mac rename to programs/games/sudoku/editbox_ex.mac diff --git a/programs/games/sudoku/trunk/sudoku.asm b/programs/games/sudoku/sudoku.asm similarity index 99% rename from programs/games/sudoku/trunk/sudoku.asm rename to programs/games/sudoku/sudoku.asm index e4efcc9cbd..7e663268c5 100644 --- a/programs/games/sudoku/trunk/sudoku.asm +++ b/programs/games/sudoku/sudoku.asm @@ -49,7 +49,7 @@ debug_print_dec num popad } -include '../../../macros.inc' +include '../../macros.inc' ;include 'debug.inc' include 'editbox_ex.mac' include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US. diff --git a/programs/games/sudoku/trunk/sudoku.fnt b/programs/games/sudoku/sudoku.fnt similarity index 100% rename from programs/games/sudoku/trunk/sudoku.fnt rename to programs/games/sudoku/sudoku.fnt diff --git a/programs/games/sw/trunk/Tupfile.lua b/programs/games/sw/Tupfile.lua similarity index 79% rename from programs/games/sw/trunk/Tupfile.lua rename to programs/games/sw/Tupfile.lua index b4a4e86803..7e8f836de2 100644 --- a/programs/games/sw/trunk/Tupfile.lua +++ b/programs/games/sw/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/sw/trunk/sw.asm b/programs/games/sw/sw.asm similarity index 99% rename from programs/games/sw/trunk/sw.asm rename to programs/games/sw/sw.asm index 1341c399c0..0de5defc05 100644 --- a/programs/games/sw/trunk/sw.asm +++ b/programs/games/sw/sw.asm @@ -15,7 +15,7 @@ DEBUG equ 0 use_new_logic equ 1 ;äîáàâëÿåò ïðîâåðêó êëåòêè íà "îêðóæ¸ííîñòü", ïðîãðàììà âûáèðàåò íàèáîëåå ñâîáîäíóþ use_ext_logic equ 1 ;ê use_new_logic, äîïîëíèòåëüíàÿ ïðîâåðêà ÿ÷ååê âîêðóã çàäàííîé êëåòêè -include '../../../macros.inc' +include '../../macros.inc' include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US. ;include 'debug.inc' diff --git a/programs/games/sw/trunk/sw_lan.asm b/programs/games/sw/sw_lan.asm similarity index 100% rename from programs/games/sw/trunk/sw_lan.asm rename to programs/games/sw/sw_lan.asm diff --git a/programs/games/tanks/trunk/Hi_win.txt b/programs/games/tanks/Hi_win.txt similarity index 100% rename from programs/games/tanks/trunk/Hi_win.txt rename to programs/games/tanks/Hi_win.txt diff --git a/programs/games/tanks/trunk/Tupfile.lua b/programs/games/tanks/Tupfile.lua similarity index 79% rename from programs/games/tanks/trunk/Tupfile.lua rename to programs/games/tanks/Tupfile.lua index 7d6e69977c..6c30d7ea49 100644 --- a/programs/games/tanks/trunk/Tupfile.lua +++ b/programs/games/tanks/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/tanks/trunk/build_en.bat b/programs/games/tanks/build_en.bat similarity index 100% rename from programs/games/tanks/trunk/build_en.bat rename to programs/games/tanks/build_en.bat diff --git a/programs/games/tanks/trunk/build_ru.bat b/programs/games/tanks/build_ru.bat similarity index 100% rename from programs/games/tanks/trunk/build_ru.bat rename to programs/games/tanks/build_ru.bat diff --git a/programs/games/tanks/trunk/data.inc b/programs/games/tanks/data.inc similarity index 100% rename from programs/games/tanks/trunk/data.inc rename to programs/games/tanks/data.inc diff --git a/programs/games/tanks/trunk/lev01.lev b/programs/games/tanks/lev01.lev similarity index 100% rename from programs/games/tanks/trunk/lev01.lev rename to programs/games/tanks/lev01.lev diff --git a/programs/games/tanks/trunk/leveledit.asm b/programs/games/tanks/leveledit.asm similarity index 100% rename from programs/games/tanks/trunk/leveledit.asm rename to programs/games/tanks/leveledit.asm diff --git a/programs/games/tanks/trunk/pixengin.inc b/programs/games/tanks/pixengin.inc similarity index 100% rename from programs/games/tanks/trunk/pixengin.inc rename to programs/games/tanks/pixengin.inc diff --git a/programs/games/tanks/trunk/tanks.asm b/programs/games/tanks/tanks.asm similarity index 99% rename from programs/games/tanks/trunk/tanks.asm rename to programs/games/tanks/tanks.asm index 976df4d6ef..d502e50531 100644 --- a/programs/games/tanks/trunk/tanks.asm +++ b/programs/games/tanks/tanks.asm @@ -26,7 +26,7 @@ format binary as "" dd 0x0 ;---------------------------------------------------------- include 'lang.inc' -include '../../../macros.inc' +include '../../macros.inc' ;---------------------------------------------------------- START: mcall 40,111b diff --git a/programs/games/tetris/trunk/Tupfile.lua b/programs/games/tetris/Tupfile.lua similarity index 79% rename from programs/games/tetris/trunk/Tupfile.lua rename to programs/games/tetris/Tupfile.lua index 7e6138ac16..a94f7ace1e 100644 --- a/programs/games/tetris/trunk/Tupfile.lua +++ b/programs/games/tetris/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/games/tetris/trunk/build_en.bat b/programs/games/tetris/build_en.bat similarity index 100% rename from programs/games/tetris/trunk/build_en.bat rename to programs/games/tetris/build_en.bat diff --git a/programs/games/tetris/trunk/build_et.bat b/programs/games/tetris/build_et.bat similarity index 100% rename from programs/games/tetris/trunk/build_et.bat rename to programs/games/tetris/build_et.bat diff --git a/programs/games/tetris/trunk/build_ru.bat b/programs/games/tetris/build_ru.bat similarity index 100% rename from programs/games/tetris/trunk/build_ru.bat rename to programs/games/tetris/build_ru.bat diff --git a/programs/games/tetris/trunk/tetris.asm b/programs/games/tetris/tetris.asm similarity index 99% rename from programs/games/tetris/trunk/tetris.asm rename to programs/games/tetris/tetris.asm index 63a8509795..bb876810f1 100644 --- a/programs/games/tetris/trunk/tetris.asm +++ b/programs/games/tetris/tetris.asm @@ -58,7 +58,7 @@ use32 dd I_END+1024 ; esp dd 0x0,0x0 ; I_PARAM, I_ICON include 'lang.inc' -include '../../../macros.inc' +include '../../macros.inc' START: ; start of execution diff --git a/programs/games/whowtbam/trunk/whowtbam.txt b/programs/games/whowtbam/whowtbam.txt similarity index 100% rename from programs/games/whowtbam/trunk/whowtbam.txt rename to programs/games/whowtbam/whowtbam.txt diff --git a/programs/games/whowtbam/trunk/wwtbam.cpp b/programs/games/whowtbam/wwtbam.cpp similarity index 100% rename from programs/games/whowtbam/trunk/wwtbam.cpp rename to programs/games/whowtbam/wwtbam.cpp diff --git a/programs/games/xonix/trunk/MCSMEMM.H b/programs/games/xonix/MCSMEMM.H similarity index 100% rename from programs/games/xonix/trunk/MCSMEMM.H rename to programs/games/xonix/MCSMEMM.H diff --git a/programs/games/xonix/trunk/Tupfile.lua b/programs/games/xonix/Tupfile.lua similarity index 73% rename from programs/games/xonix/trunk/Tupfile.lua rename to programs/games/xonix/Tupfile.lua index ff7cfe2360..cee48063b9 100644 --- a/programs/games/xonix/trunk/Tupfile.lua +++ b/programs/games/xonix/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_MSVC") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_msvc.lua") if tup.getconfig("LANG") == "ru_RU" then CFLAGS = CFLAGS .. " /DLANG=RUS" diff --git a/programs/games/xonix/trunk/fatest.sln b/programs/games/xonix/fatest.sln similarity index 100% rename from programs/games/xonix/trunk/fatest.sln rename to programs/games/xonix/fatest.sln diff --git a/programs/games/xonix/trunk/fatest.vcproj b/programs/games/xonix/fatest.vcproj similarity index 100% rename from programs/games/xonix/trunk/fatest.vcproj rename to programs/games/xonix/fatest.vcproj diff --git a/programs/games/xonix/trunk/kosSyst.cpp b/programs/games/xonix/kosSyst.cpp similarity index 100% rename from programs/games/xonix/trunk/kosSyst.cpp rename to programs/games/xonix/kosSyst.cpp diff --git a/programs/games/xonix/trunk/kosSyst.h b/programs/games/xonix/kosSyst.h similarity index 100% rename from programs/games/xonix/trunk/kosSyst.h rename to programs/games/xonix/kosSyst.h diff --git a/programs/games/xonix/trunk/lang.h b/programs/games/xonix/lang.h similarity index 100% rename from programs/games/xonix/trunk/lang.h rename to programs/games/xonix/lang.h diff --git a/programs/games/xonix/trunk/logo.bmp b/programs/games/xonix/logo.bmp similarity index 100% rename from programs/games/xonix/trunk/logo.bmp rename to programs/games/xonix/logo.bmp diff --git a/programs/games/xonix/trunk/main.cpp b/programs/games/xonix/main.cpp similarity index 100% rename from programs/games/xonix/trunk/main.cpp rename to programs/games/xonix/main.cpp diff --git a/programs/games/xonix/trunk/mcarray.h b/programs/games/xonix/mcarray.h similarity index 100% rename from programs/games/xonix/trunk/mcarray.h rename to programs/games/xonix/mcarray.h diff --git a/programs/games/xonix/trunk/mcsmemm.cpp b/programs/games/xonix/mcsmemm.cpp similarity index 100% rename from programs/games/xonix/trunk/mcsmemm.cpp rename to programs/games/xonix/mcsmemm.cpp diff --git a/programs/games/xonix/trunk/resource.h b/programs/games/xonix/resource.h similarity index 100% rename from programs/games/xonix/trunk/resource.h rename to programs/games/xonix/resource.h