diff --git a/programs/develop/libraries/ufmod/Fasm/mini.asm b/programs/develop/libraries/ufmod/Fasm/mini.asm index fd3f40c5b8..7321394b99 100644 --- a/programs/develop/libraries/ufmod/Fasm/mini.asm +++ b/programs/develop/libraries/ufmod/Fasm/mini.asm @@ -36,14 +36,14 @@ uFMOD_MAX_VOL = 25 uFMOD_DEFAULT_VOL = 25 ; The XM track. -xm file '..\ufmodlib\media\mini.xm' +xm file '..\media\mini.xm' xm_length = $ - xm ; Optimization: ; This header file is suitable for mini.xm track only! ; If you change the track, update the optimization header. ; (Use the standart eff.inc file for a general purpose player app.) -include '..\ufmodlib\media\mini.eff.inc' +include '..\media\mini.eff.inc' ; Include the GUI framework. FRMWRK_CALLBACK_ON equ 1 ; Enable callback @@ -101,7 +101,7 @@ error: ; your main code to avoid naming conflicts, but still ; inside your code section.) macro PUBLIC symbol {} ; hide all publics - include '..\ufmodlib\src\fasm.asm' + include '..\fasm.asm' align 4 rb 1020 diff --git a/programs/develop/sdk/trunk/pixlib/demo1.asm b/programs/develop/sdk/trunk/pixlib/demo1.asm index 682aecb1fd..508fe9c470 100644 --- a/programs/develop/sdk/trunk/pixlib/demo1.asm +++ b/programs/develop/sdk/trunk/pixlib/demo1.asm @@ -1,5 +1,5 @@ -include 'proc32.inc' +include '../../../../proc32.inc' struc system_colors { diff --git a/programs/develop/sdk/trunk/pixlib/demo2.asm b/programs/develop/sdk/trunk/pixlib/demo2.asm index add550353b..e8064d6f44 100644 --- a/programs/develop/sdk/trunk/pixlib/demo2.asm +++ b/programs/develop/sdk/trunk/pixlib/demo2.asm @@ -1,5 +1,5 @@ -include 'proc32.inc' +include '../../../../proc32.inc' struc system_colors { diff --git a/programs/develop/sdk/trunk/pixlib/demo3.asm b/programs/develop/sdk/trunk/pixlib/demo3.asm index 984a1fdcad..801c289d5d 100644 --- a/programs/develop/sdk/trunk/pixlib/demo3.asm +++ b/programs/develop/sdk/trunk/pixlib/demo3.asm @@ -1,5 +1,5 @@ -include 'proc32.inc' +include '../../../../proc32.inc' struc system_colors { diff --git a/programs/emulator/PrMK/trunk/lang.inc b/programs/emulator/PrMK/trunk/lang.inc deleted file mode 100644 index 30c0149bd9..0000000000 --- a/programs/emulator/PrMK/trunk/lang.inc +++ /dev/null @@ -1 +0,0 @@ -lang fix ru \ No newline at end of file diff --git a/programs/fs/kfar/trunk/kfar_arc/lang.inc b/programs/fs/kfar/trunk/kfar_arc/lang.inc deleted file mode 100644 index 30c0149bd9..0000000000 --- a/programs/fs/kfar/trunk/kfar_arc/lang.inc +++ /dev/null @@ -1 +0,0 @@ -lang fix ru \ No newline at end of file diff --git a/programs/games/bnc/trunk/lang.inc b/programs/games/bnc/trunk/lang.inc deleted file mode 100644 index 7a62d6c0b0..0000000000 --- a/programs/games/bnc/trunk/lang.inc +++ /dev/null @@ -1 +0,0 @@ -lang fix en diff --git a/programs/games/bomber/ssmix.inc b/programs/games/bomber/ssmix.inc index aec1c089a2..b5c99b67f0 100644 --- a/programs/games/bomber/ssmix.inc +++ b/programs/games/bomber/ssmix.inc @@ -6,7 +6,7 @@ SSMIX_CHANMODE_WAITRESET equ 4 include 'snd.inc' include 'snd_const.inc' -include 'proc32.inc' +include '../../proc32.inc' ;include 'macros.inc' ;include 'debug.inc' diff --git a/programs/games/lines/lines.asm b/programs/games/lines/lines.asm index 6dc5fc2d9f..f34a306bd2 100644 --- a/programs/games/lines/lines.asm +++ b/programs/games/lines/lines.asm @@ -8,7 +8,7 @@ use32 dd 0x4000 dd 0x0,0x0 -include 'macros.inc' +include '../../macros.inc' include 'lang.inc' include 'draw_window.inc' include 'ball_operations.inc' diff --git a/programs/games/soko/trunk/SOKO b/programs/games/soko/trunk/SOKO deleted file mode 100644 index 3ed1bb7352..0000000000 Binary files a/programs/games/soko/trunk/SOKO and /dev/null differ diff --git a/programs/system/apm/apm.asm b/programs/system/apm/apm.asm index 23e1686a61..d69e2c28de 100644 --- a/programs/system/apm/apm.asm +++ b/programs/system/apm/apm.asm @@ -20,7 +20,7 @@ use32 dd (I_END+100) and not 3 dd 0x0,0x0 -include 'macros.inc' +include '../../macros.inc' START: mcall 40,0x7 diff --git a/programs/system/battery/bi.asm b/programs/system/battery/bi.asm index 2f37a58f59..9ef2d16b81 100644 --- a/programs/system/battery/bi.asm +++ b/programs/system/battery/bi.asm @@ -1,5 +1,5 @@ ; Battery Indicator v0.ALPHA by Gluk -include "macros.inc" +include "../../macros.inc" MEOS_APP_START CODE