From 16b277dba21489ace3e4f172afb3b70a7834197e Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Fri, 5 Sep 2014 17:26:19 +0000 Subject: [PATCH] fix some include paths, remove some lang.inc and soko binary git-svn-id: svn://kolibrios.org@5093 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/develop/libraries/ufmod/Fasm/mini.asm | 6 +++--- programs/develop/sdk/trunk/pixlib/demo1.asm | 2 +- programs/develop/sdk/trunk/pixlib/demo2.asm | 2 +- programs/develop/sdk/trunk/pixlib/demo3.asm | 2 +- programs/emulator/PrMK/trunk/lang.inc | 1 - programs/fs/kfar/trunk/kfar_arc/lang.inc | 1 - programs/games/bnc/trunk/lang.inc | 1 - programs/games/bomber/ssmix.inc | 2 +- programs/games/lines/lines.asm | 2 +- programs/games/soko/trunk/SOKO | Bin 2945 -> 0 bytes programs/system/apm/apm.asm | 2 +- programs/system/battery/bi.asm | 2 +- 12 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 programs/emulator/PrMK/trunk/lang.inc delete mode 100644 programs/fs/kfar/trunk/kfar_arc/lang.inc delete mode 100644 programs/games/bnc/trunk/lang.inc delete mode 100644 programs/games/soko/trunk/SOKO 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 3ed1bb73523d0c1ad73a51160802da0a6b281dd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2945 zcmd^B|4&=j6~F%Sf(>@A+l8)K2Qm}u$OvFpVjI*>faY79g|CaTp>l#2dyPc^IqyMR zrRsB^J$M+T{m^vNT1Cy5UzRUjHl-%O{3URgcdG0z0YC;m`w{zZu zEkEo(*pqzkdFP({x#xV&dFOi9*2djie`K?32qC5L+i!w_SjfDbhl271YTc8&3kaF5 zi`<-Hc7cRXya9v@ufh;0@GPDPZ zYsfKgfRvsKIahabM$rEv$*X zE$nqwu(E#?mNe`wVM)st2unH|t_8sCp8{INR)M0Ca{$OMTWJ`h=a3uS%v;{=A0P=nP%{{HfP2u8{(J8xZ0y=C?xWqX9hu_!U0*9mEhIAHLzD9LET%G zQy?-8V8wr712fGqAJ53AcWnkki(Qcs_9TjCXQ986*Kc@Q{6Cg)Ghx zP5>JKC~XEpGba`3XK486AY|TyA@Bt9wyfb8dtwJlT5eyos0CPv+~iDR5!Qsv;JY-v zniAliM)ttws1uhJ>XVW|SOVZ3pca7;=e$hiFFUo8{&k?kkFSeZ(-v5u${^B77Ia*~X;>uGF2 zH(Mut0-gy@WRB4Ac^D@!zGyYZ52-3AnIoW-`XH!)!97_|-Xh~`$vG0xb;QvF<=k=G z>lW+ec}VQUVb~oo!nuNnnoHSbP_u$)XakaTd8*M{o8vu(BCa|0Xday%>))TL; z8mlk5?n5LVmM;(E>9env>;r++hX1kbU0C*OuslxhOL0@}{m zx|AC5BF9K^9oU%N3R7zIG`2^R{7gUkE&vi5Ytklf>qkWb7_)T~Ws2@iP4e?~p&2x= zC!%H!PK}T3)REKDcY%n|6gH=thli*zWeKHaSyh#j^sWD%`x2xywO3fu_dl&F?{bWg zFlOO%##}6NnmQW$g%KDK9#QtGaSK51ze&K`P->(Ye9nVv?@F};0+*+-oMqy3b8|`t zHfr(-?06pvy5m3OlgSf=KAyVSx;-gqf+KL;@t?tPEDD3l!SL6I3egQ3YuAX^l6UmN zv{S6c>bieJEUX2uaQ+_5G`3wUPAe9h#A+-$`s>SLAyP6r02yl1X+GgM$uxZHp)A|w z<Y!ABF~zH7N?Dah=UAE?7&>nT$(023=X@rAWvauH5zu#7}7~Da`4h z3qA*AXi~!hBBxqi(rsvh4t>zYcCLD8a2VM}M;`l9Ynyn3#^$9snrQkrt{N0O^0;pZ zxq^cxA(zit_~VF0_+!eH&F}2+cBCY5i*$BK3{18JD8m1s;Y0AE#-u_maN5$GO$pMV zI3$(9QQWS*E7aI!I(BX|k{G&!EJBgOSaXeAPh(Rwrfk7PTn7#nv#f4=`cjuvi2UcN z_nXC`)PTBk*t$5@?f$oIizm*?)$Aw7@;-{}tSS+T2X~pFdEt zm38uu7CDPwoRZ!F>{=xO*|JdXZP+wW=#M1Wk8trdSR@Q0Wj}l$C)LvH>2#;|+OMj4 zZD}1IMymLX>ChIb3);8CbkOD~U^hAlTLr|IgUjXWMe`SIeZ^ii6zgO6O~JGhJrQqY zf7jt@NT2LVxu7c(avmvKiLico(SM4L-6)w#W=%sy5pW2;f9P2=P)aEH&$#H=<&uX1 zy{Bc=Q{bnkyt&|(7o|&Z14!?|z2>0#$+>l6QuocTiVFzQnZEiKOcO7sGuSJ! z@6dv#K3|X3zrWk}!YjSK2YuEqYqzi8*KIAcRn%;>HveRIAC6mkHuMIqz8=;W1Pe6p z={n%UZ2sRoo?h-d{XXlDdk^$=`&i#TEBlI1<*Edif<9|sSFo#l|LeYeCD!f0j4!4f_z^zOWs=`+J!>umzwN?G<4C{EIU@2AY*ivP$QqO8?t7_Z%Vq;}%eLML# Dm2shv 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