[Scummvm-cvs-logs] scummvm master -> d4c687ddc8b5e4075c8085b7e761a9da3f2cbe74

[sev-]

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

Summary:
d4c687ddc8 GCW0: Further work on the port


Commit: d4c687ddc8b5e4075c8085b7e761a9da3f2cbe74
    https://github.com/scummvm/scummvm/commit/d4c687ddc8b5e4075c8085b7e761a9da3f2cbe74
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-26T07:00:36-04:00

Commit Message:
GCW0: Further work on the port

Changed paths:
    backends/platform/dingux/dingux.mk
    dists/gcw0/scummvm.sh
    dists/gcw0/scummvmrc
    ports.mk



diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index 48a9347..f02801e 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -1,6 +1,7 @@
 DINGUX_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
 
 bundle_name = dingux-dist/scummvm
+gcw0_bundle = gcw0-opk
 
 all: $(DINGUX_EXE_STRIPPED)
 
@@ -30,3 +31,30 @@ endif
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.gpe $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/README.DINGUX $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/
+
+# Special target for generationg GCW-Zero OPK bundle
+gcw0-opk: all
+	$(MKDIR) $(gcw0_bundle)
+	$(CP) $(DIST_FILES_DOCS) $(gcw0_bundle)/
+	$(MKDIR) $(gcw0_bundle)/themes
+	$(CP) $(DIST_FILES_THEMES) $(gcw0_bundle)/themes/
+ifdef DIST_FILES_ENGINEDATA
+	$(MKDIR) $(gcw0_bundle)/engine-data
+	$(CP) $(DIST_FILES_ENGINEDATA) $(gcw0_bundle)/engine-data/
+endif
+ifdef DYNAMIC_MODULES
+	$(MKDIR) $(gcw0_bundle)/plugins
+	$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
+	$(STRIP) $(gcw0_bundle)/plugins/*
+endif
+	$(STRIP) $(EXECUTABLE) -o $(gcw0_bundle)/scummvm
+
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(gcw0_bundle)/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(gcw0_bundle)/
+
+	$(CP) $(srcdir)/dists/gcw0/scummvm.png $(gcw0_bundle)/
+	$(CP) $(srcdir)/dists/gcw0/default.gcw0.desktop $(gcw0_bundle)/
+	$(CP) $(srcdir)/dists/gcw0/scummvmrc $(gcw0_bundle)/
+	$(CP) $(srcdir)/dists/gcw0/scummvm.sh $(gcw0_bundle)/
+	./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
+
diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh
index c12a303..5ad7a85 100755
--- a/dists/gcw0/scummvm.sh
+++ b/dists/gcw0/scummvm.sh
@@ -3,7 +3,7 @@
 cd `dirname $0`
 
 if [ ! -f $HOME/.scummvmrc ] ; then
-	cp ./scummvmrc $HOME/.scummvmrc
+	cp /mnt/ScummVM/scummvmrc $HOME/.scummvmrc
 fi
 
 exec ./scummvm
diff --git a/dists/gcw0/scummvmrc b/dists/gcw0/scummvmrc
index afa295e..87b97c1 100644
--- a/dists/gcw0/scummvmrc
+++ b/dists/gcw0/scummvmrc
@@ -2,5 +2,7 @@
 fullscreen=true
 gfx_mode=1x
 aspect_ratio=true
-themepath=/mnt/scummvm
+themepath=/mnt/ScummVM/themes
 browser_lastpath=/media
+extrapath=/mnt/ScummVM/engine-data
+pluginspath=/mnt/ScummVM/plugins
diff --git a/ports.mk b/ports.mk
index ce6bf38..97b43fe 100644
--- a/ports.mk
+++ b/ports.mk
@@ -293,22 +293,6 @@ win32setup: $(EXECUTABLE)
 	makensis -V2 -Dtop_srcdir="../.." -Dstaging_dir="../../$(STAGINGPATH)" -Darch=$(ARCH) $(srcdir)/dists/win32/scummvm.nsi
 
 
-# Special target for generationg GCW-Zero OPK bundle
-gcw0-opk:
-	mkdir gcw0-opk
-	cp $(DIST_FILES_DOCS) gcw0-opk/
-	cp $(DIST_FILES_THEMES) gcw0-opk/
-ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) gcw0-opk/
-endif
-	$(STRIP) scummvm
-	chmod 755 scummvm
-	cp scummvm gcw0-opk/
-	cp $(srcdir)/dists/gcw0/scummvm.png gcw0-opk/
-	cp $(srcdir)/dists/gcw0/default.gcw0.desktop gcw0-opk/
-	cp $(srcdir)/dists/gcw0/scummvmrc gcw0-opk/
-	cp $(srcdir)/dists/gcw0/scummvm.sh gcw0-opk/
-	./dists/gcw0/opk_make.sh -d gcw0-opk -o scummvm.opk
 #
 # Special target to generate project files for various IDEs
 # Mainly Win32-specific