From 949d4819950ef93208b1efb090e0f51f386d9732 Mon Sep 17 00:00:00 2001
From: Yogev Ezra <pr@kolibrios.org>
Date: Sat, 29 Jan 2011 14:02:44 +0000
Subject: [PATCH] Force 'web' demo to compile from sources. Remove pre-compiled
 file from 'data' folder.

git-svn-id: svn://kolibrios.org@1778 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/eng/Makefile                      |   3 ++-
 data/eng/demos/web                     | Bin 503 -> 0 bytes
 data/rus/Makefile                      |   3 ++-
 data/rus/demos/web                     | Bin 503 -> 0 bytes
 programs/demos/web/{ => trunk}/web.asm |   4 ++--
 5 files changed, 6 insertions(+), 4 deletions(-)
 delete mode 100644 data/eng/demos/web
 delete mode 100644 data/rus/demos/web
 rename programs/demos/web/{ => trunk}/web.asm (99%)

diff --git a/data/eng/Makefile b/data/eng/Makefile
index feec8822ea..4503f60b01 100644
--- a/data/eng/Makefile
+++ b/data/eng/Makefile
@@ -94,6 +94,7 @@ FASM_PROGRAMS:=\
  demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \
  demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.asm \
  demos/unvwater:DEMOS/UNVWATER:$(PROGS)/demos/unvwater/trunk/unvwater.asm \
+ demos/web:DEMOS/WEB:$(PROGS)/demos/web/trunk/web.asm \
  develop/board:DEVELOP/BOARD:$(PROGS)/system/board/trunk/board.asm \
  develop/cObj:DEVELOP/cObj:$(PROGS)/develop/cObj/trunk/cObj.asm \
  develop/fasm:DEVELOP/FASM:$(PROGS)/develop/fasm/trunk/fasm.asm \
@@ -218,7 +219,7 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \
  demos/ak47.lif:DEMOS/AK47.LIF \
  demos/barge.lif:DEMOS/BARGE.LIF demos/life2:DEMOS/LIFE2 \
  demos/relay.lif:DEMOS/RELAY.LIF demos/rpento.lif:DEMOS/RPENTO.LIF \
- demos/use_mb:DEMOS/USE_MB demos/web:DEMOS/WEB \
+ demos/use_mb:DEMOS/USE_MB \
  drivers/atikms.dll:DRIVERS/ATIKMS.DLL \
  File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP \
  File|Managers/eolite.ini:File|Managers/EOLITE.INI \
diff --git a/data/eng/demos/web b/data/eng/demos/web
deleted file mode 100644
index 14548ae9c1b157c514db23cc39b80a6887b4b0f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 503
zcmV<T0SNv}P(w?m0ssI300001Mv*2LLXK;4&&M{gp_SlwV~niVl8ox<n2V6ts@Bc_
z6KYxxnas>o@7hMZUujzskt6^5kpXs{G5`xKIky~m@f|;niC{})7S5JK5Xnx=HxuO9
zLRaB_NswI1n7UA@2V2`FD}#1pPvmSu+z|CNOEqd5x47>sAOHj-jXxPnI1+NWix+#I
zZ`pd)YmC;6PE;(=sEx<Oc@cYKALE<JHT2)oV%9auBsc;IJC}>?5W4WScSJpf5Qo7d
z=JlB3N;c142qTT*pC#mVtB!o~V<22_Uj5i1s5=JZ773D+^KN#41O9JQ6x31ElfaCa
zQn6!@I3r+n)9XuodCsU@4=kmvpMXMdK0<e_Ug&SB{0_=u@cQb|5N_A+1j3sts~X;f
zduLZc(?y_?iiLV@1lZe1s9!XZ99Bho=G~S^0Bhfc2j+T)*ZNOdDe<zoqv-30M{Y`b
zxinPA_RCOti4unOq2AyV+Zfvrshz{x4fq+v10h_}Me=+z-0q4Bt;FbEH#7=+b6_`f
zuKC{HNuroT#Uh+vF-HOS<}g4IQyiFRlkD}f5|X{%=d-8t!=|$t*E|(6l4_}e#joq=
tI(HKH6APSP41>a($HW~MU`n2F_4YQlWHW*#N2mXjt&g8c4QKH`000~x^@{)i

diff --git a/data/rus/Makefile b/data/rus/Makefile
index 469d007bcc..6912aca1ea 100644
--- a/data/rus/Makefile
+++ b/data/rus/Makefile
@@ -94,6 +94,7 @@ FASM_PROGRAMS:=\
  demos/trantest:DEMOS/TRANTEST:$(PROGS)/demos/trantest/trunk/trantest.asm \
  demos/tube:DEMOS/TUBE:$(PROGS)/demos/tube/trunk/tube.asm \
  demos/unvwater:DEMOS/UNVWATER:$(PROGS)/demos/unvwater/trunk/unvwater.asm \
+ demos/web:DEMOS/WEB:$(PROGS)/demos/web/trunk/web.asm \ 
  develop/board:DEVELOP/BOARD:$(PROGS)/system/board/trunk/board.asm \
  develop/cObj:DEVELOP/cObj:$(PROGS)/develop/cObj/trunk/cObj.asm \
  develop/fasm:DEVELOP/FASM:$(PROGS)/develop/fasm/trunk/fasm.asm \
@@ -218,7 +219,7 @@ OTHER_FILES:=asciivju:ASCIIVJU autorun.dat:AUTORUN.DAT \
  demos/ak47.lif:DEMOS/AK47.LIF \
  demos/barge.lif:DEMOS/BARGE.LIF demos/life2:DEMOS/LIFE2 \
  demos/relay.lif:DEMOS/RELAY.LIF demos/rpento.lif:DEMOS/RPENTO.LIF \
- demos/use_mb:DEMOS/USE_MB demos/web:DEMOS/WEB \
+ demos/use_mb:DEMOS/USE_MB \
  drivers/atikms.dll:DRIVERS/ATIKMS.DLL \
  File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP \
  File|Managers/eolite.ini:File|Managers/EOLITE.INI \
diff --git a/data/rus/demos/web b/data/rus/demos/web
deleted file mode 100644
index 14548ae9c1b157c514db23cc39b80a6887b4b0f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 503
zcmV<T0SNv}P(w?m0ssI300001Mv*2LLXK;4&&M{gp_SlwV~niVl8ox<n2V6ts@Bc_
z6KYxxnas>o@7hMZUujzskt6^5kpXs{G5`xKIky~m@f|;niC{})7S5JK5Xnx=HxuO9
zLRaB_NswI1n7UA@2V2`FD}#1pPvmSu+z|CNOEqd5x47>sAOHj-jXxPnI1+NWix+#I
zZ`pd)YmC;6PE;(=sEx<Oc@cYKALE<JHT2)oV%9auBsc;IJC}>?5W4WScSJpf5Qo7d
z=JlB3N;c142qTT*pC#mVtB!o~V<22_Uj5i1s5=JZ773D+^KN#41O9JQ6x31ElfaCa
zQn6!@I3r+n)9XuodCsU@4=kmvpMXMdK0<e_Ug&SB{0_=u@cQb|5N_A+1j3sts~X;f
zduLZc(?y_?iiLV@1lZe1s9!XZ99Bho=G~S^0Bhfc2j+T)*ZNOdDe<zoqv-30M{Y`b
zxinPA_RCOti4unOq2AyV+Zfvrshz{x4fq+v10h_}Me=+z-0q4Bt;FbEH#7=+b6_`f
zuKC{HNuroT#Uh+vF-HOS<}g4IQyiFRlkD}f5|X{%=d-8t!=|$t*E|(6l4_}e#joq=
tI(HKH6APSP41>a($HW~MU`n2F_4YQlWHW*#N2mXjt&g8c4QKH`000~x^@{)i

diff --git a/programs/demos/web/web.asm b/programs/demos/web/trunk/web.asm
similarity index 99%
rename from programs/demos/web/web.asm
rename to programs/demos/web/trunk/web.asm
index 7fbb4194e4..069ba28df2 100644
--- a/programs/demos/web/web.asm
+++ b/programs/demos/web/trunk/web.asm
@@ -5,10 +5,10 @@
 
 ;Used assumptions:
 ;   1) Screen resolution does not change while app is running
-;   2) Screen width bigger then height
+;   2) Screen width bigger than height
 ;   3) Screen width and height are even (2*k)
 
-include "macros.inc"
+include '..\..\..\macros.inc'
 
 background_cl = 0x000000
 foreground_cl = 0xFFFFFF