From 06c7a56d80d7c53ec34b555bd6e3b0ee4a88b1a2 Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Fri, 15 Jun 2012 14:53:20 +0000 Subject: [PATCH] fix git-svn-id: svn://kolibrios.org@2789 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile.fasm | 11 +++++++++++ data/eng/games/soko | Bin 0 -> 2952 bytes 2 files changed, 11 insertions(+) create mode 100644 data/eng/games/soko diff --git a/data/eng/Makefile.fasm b/data/eng/Makefile.fasm index acf397fb8..7e81ac593 100644 --- a/data/eng/Makefile.fasm +++ b/data/eng/Makefile.fasm @@ -37,9 +37,20 @@ $(1): $(2) Makefile.fasm .deps/.dir $$(call respace,$$(addsuffix .dir,$(3))) -include .deps/$(4).Po endef +define fasm_nokpack_meta_rule +$(1): $(2) Makefile.fasm .deps/.dir $$(call respace,$$(addsuffix .dir,$(3))) + fasm -m 65536 "$$<" "$$@" -s .deps/$(4).fas + prepsrc .deps/$(4).fas /dev/null + prepsrc .deps/$(4).fas /dev/stdout | \ + perl -n -e 's|\\|/|g;s| |\\ |g;push @a,$$$$1 if/^;include\\ \x27(.*?)\x27/;' \ + -e 'END{$$$$a=join " \\\n ",@a;print q`$(1): `,"$$$$a\n$$$$a:\n"}' > .deps/$(4).Po +-include .deps/$(4).Po +endef + progname=$(call respace,$(basename $(notdir $(call binarypart,$(f))))) binarydir=$(subst ./,,$(dir $(call binarypart,$(f)))) $(foreach f,$(FASM_PROGRAMS) $(FASM_PROGRAMS_CD) $(SKIN_SOURCES),$(eval $(call fasm_meta_rule,$(fbinary),$(fsource),$(binarydir),$(progname)))) +$(foreach f,$(FASM_NOKPACK_PROGRAMS),$(eval $(call fasm_nokpack_meta_rule,$(fbinary),$(fsource),$(binarydir),$(progname)))) # Rule for the kernel differs: it uses kerpack instead of kpack. kernel.mnt: $(KERNEL)/kernel.asm Makefile.fasm .deps/.dir diff --git a/data/eng/games/soko b/data/eng/games/soko new file mode 100644 index 0000000000000000000000000000000000000000..e5b95f3a26986783b4f2fbe7b0af81fc626a2245 GIT binary patch literal 2952 zcmd^B|8JA$5r6#UCAMSpn2vO1U63PX31{zI!xMF^>ce}5?~#7t)85@eL;1PafFliXt$ z|1-IUdnnfSQ$i+}wd{PsHQAu8-d*21(V!#222Y#?)hTD+bYc%M5eMo8OTF`_g9h&; z69(CcOGRwSQ@@0bz$CL1Bv$K_hOaDBm7`wYhpb@;%?nN@^GV3DWXtJcXDE9N0v}NOFwyj+PLq6?TFK&y6m2R&*6twC^H#;ukD5jPURam$+)dfq@hDj8KJ)fp@%!8E~e82~(M1@Nr|ogd`W@ z7e={_L#QYu4V#!@V5o3FmSrXVqHP`6DlimnYYK{s>{ig?KezG=dU|vd@HF}d4TGMR z+^hj%MB6vAf{;^hgM5IT#Hh1cG+eky!?^-77rNd2=NI?|O|OeauhP-77=y zvxo_|Y7EM2iA@^-t7m=jRpclMY5|Abibb$ET{sD7fJ12u0Gb_ETt7?0zXm4zHY~vv zh}(jSV{FOikyCSfBjpDHg}!OdD3%9-lNo%LCYDM9*wel}U>tGawgP=h(g}HR{5*(- zyos$8@;Y{T|IukZ+M`-7(I>Mp*`)CAL1J8GM0x1@kcNN$FIi5Y?u2$ZslSYUJAXPW zfHeC6mPzI`WbcGxPBJHey8@-0RLTMjxs0uuKtM0Z{FYhvX>qeKp&cWDl&mP-KmVyN z_qQP|V>*`)8a=k@=cb&tWSo%WL{pBw0m<(YjR~E{uEvKoiEDfle;F2dDFD;Bj_Amk z{Ka3*v6YzeQ$FlWrQ2A0#DR4Tr3o1(gRNQ`?bS>#o!GXvT8omT;4D*ZBV*XI7 z^(6Za2&F@iR8Z%M*OS-D*m81_1T}35j6gYe%=)U?62An6jlBofK|P!suOe&7<_~O5UQ}hn5D)p&$ z@GWpiXtYtCx~m-&3HX?D#?~sb*Ho#`R)!`~!Iq4e-h@*VBQ6a&D}4um2#w?Ps(W;V z3ghNbMwW}B^(1rWzvnhUNz)xdUfc6bQFxzYgrq(PuQS$So>Mt#^vyMZfbf{IPmh_w z<-TbG(T36^6%ca?bbDvI6+Cby3d%VqF*7rxRA7V3K)~VzG<4g4z$fw3gg#liDd(Ov zjKL8&?$qyKIe8wIA_fCr?=QnJXtY%&-b~%o3KI^o7Q5@K+hSQOM1`~kD2?t=ixY~* zX0aBVj*eUt%Mg;mUZ_x`M)eWDS*GDTk7U^(E5coxl(hBh{@8yMQIjG78rR;` z?1sJ6j8UI2Fc``bF6Ba2cl~Za7{f>jR}&CJ$bCzOC0DV8m!5Z^k*b%{s0q1%7}lQy z>hpSbWR3}s$ZJBeRJI!fuj9Fu1-qKnY|YFCL}et=sB&z&xv7#4m@s|*;T)&6FUytj z59c|ZUB?>j`kbywn1KnQ^LV^z@nafI2{Rg)f{g%%Dm@^e=k#v3bQgx8UEA$u+m|BL z+4Zc;Uc&xhcZ+zNMrWl2s;GK4EGewEmvG+@3Z;jQLcze9`BUhN@Fx|LGqkt)+R~B{ zFlcX+7$DXp2*Uqhj}-GMx|!qDl?AJkpiT)!+5pFJyE+zOvB`Aw;uZujbPo}P28Ffm zCbx=4$7xhC!6MuO{1mmEW=G~~r&Na6mlW?dvt7-V1jKS2#?b3h!Ij)U)w3i!FTp~5H_^_B(t zlI#b#`BT^=40_7Fe*#HS)8}pXq&sXkiZyNCJurYU@mb@MZIT~Gx7~QyYA_7zjHJaN~QPAJ(E@pkU_ZQiY!;m))hCNd$H5TeBl>lfw&XXxnd zit$v=*kAq|*nxK+=G7#$5i)^uZaR9c;!#lRZ65TN2Iv`Ip?lj4(lwa=(g|3&?-eU` zpVMt*(4Jf4R$K(mRpje#v8F%>UKkGAaO3(y=|*Eb2Hr$sl_=@qdh9|mhHw@4`_7Gb^QzBo+_1D zDSn)qSt+J8-~4hDw6w=1w{%+e`+NNR zEo-e+bsH>AKY8g8uG*}`n53>Gl&_MNrod^6_&HtO9w~PCBkKgj+t^