[Scummvm-cvs-logs] scummvm branch-1-8 -> c96cdce1869209faaa54cf872bbe5aa26de75a63

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
48431d9506 GCW0: Packaging fixes
c96cdce186 GCW0: For the time being replace [ and ] in the README


Commit: 48431d95065c3ac4d7cd03de5a7611e41bc0cdde
    https://github.com/scummvm/scummvm/commit/48431d95065c3ac4d7cd03de5a7611e41bc0cdde
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-26T22:03:22+01:00

Commit Message:
GCW0: Packaging fixes

Changed paths:
  A backends/platform/dingux/README.GCW0
    backends/platform/dingux/build.gcw0.sh
    backends/platform/dingux/dingux.mk



diff --git a/backends/platform/dingux/README.GCW0 b/backends/platform/dingux/README.GCW0
new file mode 100644
index 0000000..1875e53
--- /dev/null
+++ b/backends/platform/dingux/README.GCW0
@@ -0,0 +1,26 @@
+[ScummVM-GCW0 README]
+
+Controls
+========
+- Dpad/analog joy: move mouse cursor
+- A: left mouse button click
+- B: right mouse button click
+- X: '0' key
+- Y: '.' key (skips dialogue line in some engines)
+- Left Trigger: open global menu
+- Right Trigger: opens virtual keyboard
+- Select: ESC button, scene skip in some engines
+- Start: F5 key, game menu in some engines
+
+Installation from binaries
+==========================
+Copy over scummvm.opk file
+
+Building from binaries
+======================
+It's pretty simple if you are running Linux on an x86/amd64 machine:
+1. Download and install the GCW0 toolchain (http://www.gcw-zero.com/develop)
+2. Download ScummVM sources and uncompress them
+3. Run backends/platform/dingux/build.gcw0.sh script
+4. Copy the resulting file scummvm.opk to your device
+5. Enjoy
diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh
index 62e084f..c4bb9d2 100755
--- a/backends/platform/dingux/build.gcw0.sh
+++ b/backends/platform/dingux/build.gcw0.sh
@@ -3,4 +3,4 @@
 export PATH=/opt/gcw0-toolchain/usr/bin:$PATH
 
 # Disable high resolution engines since we have 320x240 hardware
-./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release  --disable-engine=mohawk,neverhood,sword25,toltecs,wintermute,zvision --disable-mt32emu --disable-scalers && make -j6 gcw-opk && ls -l scummvm.opk
+./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release  --disable-engine=mohawk,neverhood,sword25,toltecs,wintermute,zvision --disable-mt32emu --disable-hq-scalers && make -j6 gcw-opk && ls -l scummvm.opk
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index c94b42e..56c26c3 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -55,8 +55,10 @@ endif
 	$(CP) $(srcdir)/dists/gcw0/default.gcw0.desktop $(gcw0_bundle)/
 	$(CP) $(srcdir)/dists/gcw0/scummvmrc $(gcw0_bundle)/
 	$(CP) $(srcdir)/dists/gcw0/scummvm.sh $(gcw0_bundle)/
-	$(CP) $(srcdir)/backends/platforms/dingux/README.GCW0 $(gcw0_bundle)/README.man.txt
+	$(CP) $(srcdir)/backends/platform/dingux/README.GCW0 $(gcw0_bundle)/README.man.txt
+	echo >> $(gcw0_bundle)/README.man.txt
 	echo '[General README]' >> $(gcw0_bundle)/README.man.txt
+	echo >> $(gcw0_bundle)/README.man.txt
 	cat README >> $(gcw0_bundle)/README.man.txt
 
 #	$(CP) GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(gcw0_bundle)/


Commit: c96cdce1869209faaa54cf872bbe5aa26de75a63
    https://github.com/scummvm/scummvm/commit/c96cdce1869209faaa54cf872bbe5aa26de75a63
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-26T22:03:22+01:00

Commit Message:
GCW0: For the time being replace [ and ] in the README

The platform uses built-in browser which treats those as
sections. Cannot find the people who implemented it (they're using
modified gmenu2x here, and have my device misplaced.

Thus temporarily spoiling the README for 1.8.0

Changed paths:
    backends/platform/dingux/dingux.mk



diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index 56c26c3..c265103 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -59,7 +59,7 @@ endif
 	echo >> $(gcw0_bundle)/README.man.txt
 	echo '[General README]' >> $(gcw0_bundle)/README.man.txt
 	echo >> $(gcw0_bundle)/README.man.txt
-	cat README >> $(gcw0_bundle)/README.man.txt
+	cat README | sed -e 's/\[/{/g;s/\]/}/g' >> $(gcw0_bundle)/README.man.txt
 
 #	$(CP) GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(gcw0_bundle)/