[Scummvm-git-logs] scummvm master -> 0334411d639fca4ab76b5c3c60efc9b66115b555

bluegr bluegr at gmail.com
Mon Jul 8 11:42:26 CEST 2019


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:
0334411d63 BUILD: Package networking and virtual keyboard files on all platforms


Commit: 0334411d639fca4ab76b5c3c60efc9b66115b555
    https://github.com/scummvm/scummvm/commit/0334411d639fca4ab76b5c3c60efc9b66115b555
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-07-08T12:42:21+03:00

Commit Message:
BUILD: Package networking and virtual keyboard files on all platforms

Changed paths:
    Makefile
    Makefile.common
    backends/platform/android/android.mk
    backends/platform/androidsdl/androidsdl.mk
    backends/platform/dingux/dingux.mk
    backends/platform/gph/caanoo-bundle.mk
    backends/platform/gph/gp2x-bundle.mk
    backends/platform/gph/gp2xwiz-bundle.mk
    backends/platform/linuxmoto/linuxmoto.mk
    backends/platform/n64/n64.mk
    backends/platform/openpandora/op-bundle.mk
    backends/platform/sdl/amigaos/amigaos.mk
    backends/platform/sdl/ps3/ps3.mk
    backends/platform/sdl/psp2/psp2.mk
    backends/platform/sdl/riscos/riscos.mk
    backends/platform/sdl/switch/switch.mk
    backends/platform/webos/webos.mk
    backends/platform/wii/wii.mk
    ports.mk


diff --git a/Makefile b/Makefile
index 56ebfc7..055581e 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ endif
 
 .PHONY: print-dists print-executables print-version print-distversion
 print-dists:
-	@echo $(DIST_FILES_DOCS) $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_PLATFORM) $(srcdir)/doc
+	@echo $(DIST_FILES_DOCS) $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_PLATFORM) $(srcdir)/doc
 
 print-executables:
 	@echo $(if $(DIST_EXECUTABLES),$(DIST_EXECUTABLES),$(EXECUTABLE) $(PLUGINS))
diff --git a/Makefile.common b/Makefile.common
index 9df4e60..95b090a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -302,6 +302,12 @@ ifdef USE_SDL_NET
 DIST_FILES_NETWORKING:=$(addprefix $(srcdir)/dists/networking/,wwwroot.zip)
 endif
 
+# Virtual keyboard files
+DIST_FILES_VKEYBD=
+ifdef ENABLE_VKEYBD
+DIST_FILES_VKEYBD:=$(addprefix $(srcdir)/backends/vkeybd/packs/,vkeybd_default.zip vkeybd_small.zip)
+endif
+
 # Engine data files
 DIST_FILES_ENGINEDATA=
 ifdef ENABLE_ACCESS
diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index 4a29526..b5f559c 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -49,9 +49,9 @@ $(PATH_BUILD)/libs/%: $(PATH_DIST)/libs/% | $(PATH_BUILD)
 	@$(MKDIR) -p $(@D)
 	$(CP) $< $@
 
-$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_SHADERS) $(DIST_BUILD_XML) | $(PATH_BUILD)
+$(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_BUILD_XML) | $(PATH_BUILD)
 	$(INSTALL) -d $(PATH_BUILD_ASSETS)
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(PATH_BUILD_ASSETS)/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(PATH_BUILD_ASSETS)/
 	$(INSTALL) -d $(PATH_BUILD)/jni
 	$(INSTALL) -c -m 644 $(DIST_ANDROID_MK) $(PATH_BUILD)/jni
 	$(INSTALL) -c -m 644 $(DIST_BUILD_XML) $(PATH_BUILD)
diff --git a/backends/platform/androidsdl/androidsdl.mk b/backends/platform/androidsdl/androidsdl.mk
index cf6ab6a..2872101 100644
--- a/backends/platform/androidsdl/androidsdl.mk
+++ b/backends/platform/androidsdl/androidsdl.mk
@@ -1,9 +1,8 @@
 # Special target to create an AndroidSDL snapshot
 androidsdl: 
 	$(MKDIR) release
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release
 	zip -j scummvm_2_1_0-git-appdata.zip release/*
 	split -d -b 1000000 scummvm_2_1_0-git-appdata.zip scummvm_2_1_0-git-appdata.zip0
 	$(RM) -r scummvm_2_1_0-git-appdata.zip
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index 52d97e0..e234718 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -20,14 +20,18 @@ dingux-dist: all
 ifdef DIST_FILES_ENGINEDATA
 	$(CP) $(DIST_FILES_ENGINEDATA) $(bundle_name)/
 endif
+ifdef DIST_FILES_NETWORKING
+	$(CP) $(DIST_FILES_NETWORKING) $(bundle_name)/
+endif
+ifdef DIST_FILES_VKEYBD
+	$(CP) $(DIST_FILES_VKEYBD) $(bundle_name)/
+endif
 	$(CP) $(DIST_FILES_DOCS) $(bundle_name)/
 ifdef DYNAMIC_MODULES
 		$(MKDIR) $(bundle_name)/plugins
 		$(CP) $(PLUGINS) $(bundle_name)/plugins
 		$(STRIP) $(bundle_name)/plugins/*
 endif
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/
 	$(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)/
@@ -42,15 +46,18 @@ ifdef DIST_FILES_ENGINEDATA
 	$(MKDIR) $(gcw0_bundle)/engine-data
 	$(CP) $(DIST_FILES_ENGINEDATA) $(gcw0_bundle)/engine-data/
 endif
+ifdef DIST_FILES_NETWORKING
+	$(CP) $(DIST_FILES_NETWORKING) $(gcw0_name)/
+endif
+ifdef DIST_FILES_VKEYBD
+	$(CP) $(DIST_FILES_VKEYBD) $(gcw0_name)/
+endif
 ifdef DYNAMIC_MODULES
 	$(MKDIR) $(gcw0_bundle)/plugins
 	$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
 endif
 	$(CP) $(EXECUTABLE) $(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)/
diff --git a/backends/platform/gph/caanoo-bundle.mk b/backends/platform/gph/caanoo-bundle.mk
index 9362dae..f6dd5a1 100644
--- a/backends/platform/gph/caanoo-bundle.mk
+++ b/backends/platform/gph/caanoo-bundle.mk
@@ -22,9 +22,15 @@ caanoo-bundle: $(EXECUTABLE)
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+ifdef DIST_FILES_ENGINEDATA
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
+endif
+ifdef DIST_FILES_NETWORKING
+	$(INSTALL) -c -m 644 $(DIST_FILES_NETWORKING) $(bundle_name)/scummvm/
+endif
+ifdef DIST_FILES_VKEYBD
+	$(INSTALL) -c -m 644 $(DIST_FILES_VKEYBD) $(bundle_name)/scummvm/
+endif
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
 
@@ -54,9 +60,15 @@ caanoo-bundle-debug: $(EXECUTABLE)
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+ifdef DIST_FILES_ENGINEDATA
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
+endif
+ifdef DIST_FILES_NETWORKING
+	$(INSTALL) -c -m 644 $(DIST_FILES_NETWORKING) $(bundle_name)/scummvm/
+endif
+ifdef DIST_FILES_VKEYBD
+	$(INSTALL) -c -m 644 $(DIST_FILES_VKEYBD) $(bundle_name)/scummvm/
+endif
 
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
 
diff --git a/backends/platform/gph/gp2x-bundle.mk b/backends/platform/gph/gp2x-bundle.mk
index d430ae6..ea38ae3 100644
--- a/backends/platform/gph/gp2x-bundle.mk
+++ b/backends/platform/gph/gp2x-bundle.mk
@@ -19,9 +19,15 @@ gp2x-bundle: $(EXECUTABLE)
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)
+ifdef DIST_FILES_ENGINEDATA
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)
+endif
+ifdef DIST_FILES_NETWORKING
+	$(INSTALL) -c -m 644 $(DIST_FILES_NETWORKING) $(bundle_name)
+endif
+ifdef DIST_FILES_VKEYBD
+	$(INSTALL) -c -m 644 $(DIST_FILES_VKEYBD) $(bundle_name)
+endif
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/$(EXECUTABLE)
 
@@ -51,9 +57,15 @@ gp2x-bundle-debug: $(EXECUTABLE)
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)
+ifdef DIST_FILES_ENGINEDATA
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)
+endif
+ifdef DIST_FILES_NETWORKING
+	$(INSTALL) -c -m 644 $(DIST_FILES_NETWORKING) $(bundle_name)
+endif
+ifdef DIST_FILES_VKEYBD
+	$(INSTALL) -c -m 644 $(DIST_FILES_VKEYBD) $(bundle_name)
+endif
 
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/$(EXECUTABLE)
 
diff --git a/backends/platform/gph/gp2xwiz-bundle.mk b/backends/platform/gph/gp2xwiz-bundle.mk
index 36a720a..9d543e3 100644
--- a/backends/platform/gph/gp2xwiz-bundle.mk
+++ b/backends/platform/gph/gp2xwiz-bundle.mk
@@ -21,9 +21,15 @@ gp2xwiz-bundle: $(EXECUTABLE)
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+ifdef DIST_FILES_ENGINEDATA
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
+endif
+ifdef DIST_FILES_NETWORKING
+	$(INSTALL) -c -m 644 $(DIST_FILES_NETWORKING) $(bundle_name)/scummvm/
+endif
+ifdef DIST_FILES_VKEYBD
+	$(INSTALL) -c -m 644 $(DIST_FILES_VKEYBD) $(bundle_name)/scummvm/
+endif
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
 
@@ -56,9 +62,15 @@ gp2xwiz-bundle-debug: $(EXECUTABLE)
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+ifdef DIST_FILES_ENGINEDATA
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
+endif
+ifdef DIST_FILES_NETWORKING
+	$(INSTALL) -c -m 644 $(DIST_FILES_NETWORKING) $(bundle_name)/scummvm/
+endif
+ifdef DIST_FILES_VKEYBD
+	$(INSTALL) -c -m 644 $(DIST_FILES_VKEYBD) $(bundle_name)/scummvm/
+endif
 
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
 
diff --git a/backends/platform/linuxmoto/linuxmoto.mk b/backends/platform/linuxmoto/linuxmoto.mk
index 937fb4e..0cd02f0 100644
--- a/backends/platform/linuxmoto/linuxmoto.mk
+++ b/backends/platform/linuxmoto/linuxmoto.mk
@@ -2,10 +2,8 @@
 motoezx: $(EXECUTABLE)
 	$(MKDIR) release/scummvm
 	$(STRIP) $(EXECUTABLE) -o release/scummvm/$(EXECUTABLE)
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/scummvm/
 	$(CP) $(srcdir)/dists/motoezx/* release/scummvm/
 	tar -C release -cvzf release/ScummVM-motoezx.pkg scummvm
 	$(RM) -r release/scummvm
@@ -14,10 +12,8 @@ motoezx: $(EXECUTABLE)
 motomagx-mpkg: $(EXECUTABLE)
 	$(MKDIR) release/scummvm
 	$(STRIP) $(EXECUTABLE) -o release/scummvm/$(EXECUTABLE)
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/scummvm/
 	$(CP) $(srcdir)/dists/motomagx/mpkg/* release/scummvm/
 	tar -C release -cvzf release/ScummVM-motomagx.mpkg scummvm
 	$(RM) -r release/scummvm
@@ -25,10 +21,8 @@ motomagx-mpkg: $(EXECUTABLE)
 motomagx-mgx: $(EXECUTABLE)
 	$(MKDIR) release/scummvm
 	$(STRIP) $(EXECUTABLE) -o release/scummvm/$(EXECUTABLE)
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/scummvm/
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/scummvm/
 	$(CP) $(srcdir)/dists/motomagx/mgx/* release/scummvm/
 	tar -C release -cvf release/ScummVM-motomagx.mgx scummvm
 	$(RM) -r release/scummvm
@@ -38,10 +32,8 @@ motomagx-pep: $(EXECUTABLE)
 	$(CP) -r $(srcdir)/dists/motomagx/pep/* release/pep
 	$(RM) -r release/pep/app/.svn
 	$(STRIP) $(EXECUTABLE) -o release/pep/app/$(EXECUTABLE)
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/pep/app
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) release/pep/app
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/pep/app
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/pep/app
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/pep/app
 	tar -C release/pep -czvf release/ScummVM-motomagx.pep app description.ini  scummvm_big_usr.png  scummvm_small_usr.png
 	$(RM) -r release/pep
 
diff --git a/backends/platform/n64/n64.mk b/backends/platform/n64/n64.mk
index 3198170..a8af336 100644
--- a/backends/platform/n64/n64.mk
+++ b/backends/platform/n64/n64.mk
@@ -18,9 +18,13 @@ n64-dist: all
 ifdef DIST_FILES_ENGINEDATA
 	$(CP) $(DIST_FILES_ENGINEDATA) $(bundle_name)/romfs
 endif
+ifdef DIST_FILES_NETWORKING
+	$(CP) $(DIST_FILES_NETWORKING) $(bundle_name)/romfs
+endif
+ifdef DIST_FILES_VKEYBD
+	$(CP) $(DIST_FILES_VKEYBD) $(bundle_name)/romfs
+endif
 	$(CP) $(DIST_FILES_DOCS) $(bundle_name)/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/romfs
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/romfs
 	genromfs -f $(bundle_name)/romfs.img -d $(bundle_name)/romfs -V scummvmn64
 	mips64-objcopy $(EXECUTABLE) $(bundle_name)/scummvm.elf -O binary
 	cat $(N64SDK)/hkz-libn64/bootcode $(bundle_name)/scummvm.elf $(bundle_name)/romfs.img > scummvm.v64
diff --git a/backends/platform/openpandora/op-bundle.mk b/backends/platform/openpandora/op-bundle.mk
index 284a049..fe107ee 100644
--- a/backends/platform/openpandora/op-bundle.mk
+++ b/backends/platform/openpandora/op-bundle.mk
@@ -27,7 +27,15 @@ op-bundle: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/docs/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/data/
+ifdef DIST_FILES_ENGINEDATA
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/data/
+endif
+ifdef DIST_FILES_NETWORKING
+	$(INSTALL) -c -m 644 $(DIST_FILES_NETWORKING) $(bundle_name)/scummvm/data/
+endif
+ifdef DIST_FILES_VKEYBD
+	$(INSTALL) -c -m 644 $(DIST_FILES_VKEYBD) $(bundle_name)/scummvm/data/
+endif
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/bin/$(EXECUTABLE)
 
@@ -63,7 +71,15 @@ op-pnd: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/docs/
 
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/data/
+ifdef DIST_FILES_ENGINEDATA
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/data/
+endif
+ifdef DIST_FILES_NETWORKING
+	$(INSTALL) -c -m 644 $(DIST_FILES_NETWORKING) $(bundle_name)/scummvm/data/
+endif
+ifdef DIST_FILES_VKEYBD
+	$(INSTALL) -c -m 644 $(DIST_FILES_VKEYBD) $(bundle_name)/scummvm/data/
+endif
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/bin/$(EXECUTABLE)
 
diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk
index afd1276..7643ed1 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -10,6 +10,12 @@ amigaosdist: $(EXECUTABLE)
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(AMIGAOSPATH)/extras/
 endif
+ifdef DIST_FILES_NETWORKING
+	cp $(DIST_FILES_NETWORKING) $(AMIGAOSPATH)/extras/
+endif
+ifdef DIST_FILES_VKEYBD
+	cp $(DIST_FILES_VKEYBD) $(AMIGAOSPATH)/extras/
+endif
 	cat ${srcdir}/README.md | sed -f ${srcdir}/dists/amiga/convertRM.sed > README.conv
 # AmigaOS's shell is not happy with indented comments, thus don't do it.
 # AREXX seems to have problems when ${srcdir} is '.'. It will break with a
diff --git a/backends/platform/sdl/ps3/ps3.mk b/backends/platform/sdl/ps3/ps3.mk
index a06409f..d660281 100644
--- a/backends/platform/sdl/ps3/ps3.mk
+++ b/backends/platform/sdl/ps3/ps3.mk
@@ -9,10 +9,14 @@ ps3pkg: $(EXECUTABLE)
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) ps3pkg/USRDIR/data/
 endif
+ifdef DIST_FILES_NETWORKING
+	cp $(DIST_FILES_NETWORKING) ps3pkg/USRDIR/data/
+endif
+ifdef DIST_FILES_VKEYBD
+	cp $(DIST_FILES_VKEYBD) ps3pkg/USRDIR/data/
+endif
 	cp $(DIST_FILES_DOCS) ps3pkg/USRDIR/doc/
 	cp $(srcdir)/dists/ps3/readme-ps3.md ps3pkg/USRDIR/doc/
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip ps3pkg/USRDIR/data/
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip ps3pkg/USRDIR/data/
 	cp $(srcdir)/dists/ps3/ICON0.PNG ps3pkg/
 	cp $(srcdir)/dists/ps3/PIC1.PNG ps3pkg/
 	sfo.py -f $(srcdir)/dists/ps3/sfo.xml ps3pkg/PARAM.SFO
diff --git a/backends/platform/sdl/psp2/psp2.mk b/backends/platform/sdl/psp2/psp2.mk
index b39194e..c1396ce 100644
--- a/backends/platform/sdl/psp2/psp2.mk
+++ b/backends/platform/sdl/psp2/psp2.mk
@@ -11,12 +11,16 @@ psp2vpk: $(EXECUTABLE)
 	cp $(srcdir)/dists/psp2/template.xml psp2pkg/sce_sys/livearea/contents/
 	cp $(srcdir)/dists/psp2/bg.png psp2pkg/sce_sys/livearea/contents/
 	cp $(srcdir)/dists/psp2/startup.png psp2pkg/sce_sys/livearea/contents/
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip psp2pkg/data/
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip psp2pkg/data/
 	cp $(DIST_FILES_THEMES) psp2pkg/data/
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) psp2pkg/data/
 endif
+ifdef DIST_FILES_NETWORKING
+	cp $(DIST_FILES_NETWORKING) psp2pkg/data/
+endif
+ifdef DIST_FILES_VKEYBD
+	cp $(DIST_FILES_VKEYBD) psp2pkg/data/
+endif
 	cp $(DIST_FILES_DOCS) psp2pkg/doc/
 	cp $(srcdir)/dists/psp2/readme-psp2.md psp2pkg/doc/
 	cd psp2pkg && zip -r ../$(EXECUTABLE).vpk . && cd ..
diff --git a/backends/platform/sdl/riscos/riscos.mk b/backends/platform/sdl/riscos/riscos.mk
index 9561785..80db76c 100644
--- a/backends/platform/sdl/riscos/riscos.mk
+++ b/backends/platform/sdl/riscos/riscos.mk
@@ -23,6 +23,9 @@ endif
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(APP_NAME)/data/
 endif
+ifdef DIST_FILES_VKEYBD
+	cp $(DIST_FILES_VKEYBD) $(APP_NAME)/data/
+endif
 ifdef DYNAMIC_MODULES
 	mkdir -p $(APP_NAME)/plugins
 	cp $(PLUGINS) $(APP_NAME)/plugins/
diff --git a/backends/platform/sdl/switch/switch.mk b/backends/platform/sdl/switch/switch.mk
index 0f5e23f..8d5e95f 100644
--- a/backends/platform/sdl/switch/switch.mk
+++ b/backends/platform/sdl/switch/switch.mk
@@ -6,23 +6,19 @@ scummvm.nro: $(EXECUTABLE)
 
 switch_release: scummvm.nro
 	rm -f ./switch_release/scummvm.nacp
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip ./switch_release/scummvm/data
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip ./switch_release/scummvm/data
 	cp $(DIST_FILES_THEMES) ./switch_release/scummvm/data
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) ./switch_release/scummvm/data
 endif
-	cp $(DIST_FILES_DOCS) ./switch_release/scummvm/doc/
-
-scummvm_switch.zip: scummvm.nro
-	rm -f ./switch_release/scummvm.nacp
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip ./switch_release/scummvm/data
-	cp $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip ./switch_release/scummvm/data
-	cp $(DIST_FILES_THEMES) ./switch_release/scummvm/data
-ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) ./switch_release/scummvm/data
+ifdef DIST_FILES_NETWORKING
+	cp $(DIST_FILES_NETWORKING) ./switch_release/scummvm/data
+endif
+ifdef DIST_FILES_VKEYBD
+	cp $(DIST_FILES_VKEYBD) ./switch_release/scummvm/data
 endif
 	cp $(DIST_FILES_DOCS) ./switch_release/scummvm/doc/
+
+scummvm_switch.zip: switch_release
 	cd ./switch_release && zip -r ../scummvm_switch.zip . && cd ..
 
 .PHONY: scummvm.nro switch_release scummvm_switch.zip
diff --git a/backends/platform/webos/webos.mk b/backends/platform/webos/webos.mk
index 1f4b92b..07d8aab 100644
--- a/backends/platform/webos/webos.mk
+++ b/backends/platform/webos/webos.mk
@@ -80,7 +80,7 @@ endif
 	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(docdir)"
 	$(QUIET)$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
 	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(datadir)"
-	$(QUIET)$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
+	$(QUIET)$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
 ifdef DYNAMIC_MODULES
 	$(QUIET)$(INSTALL) -d "$(DESTDIR)$(libdir)/"
 	$(QUIET)$(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/"
diff --git a/backends/platform/wii/wii.mk b/backends/platform/wii/wii.mk
index 62a8900..fbfc9a7 100644
--- a/backends/platform/wii/wii.mk
+++ b/backends/platform/wii/wii.mk
@@ -42,8 +42,12 @@ endif
 ifneq ($(DIST_FILES_ENGINEDATA),)
 	$(CP) $(DIST_FILES_ENGINEDATA) wiidist/scummvm/
 endif
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip wiidist/scummvm/
-	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip wiidist/scummvm/
+ifneq ($(DIST_FILES_NETWORKING),)
+	$(CP) $(DIST_FILES_NETWORKING) wiidist/scummvm/
+endif
+ifneq ($(DIST_FILES_VKEYBD),)
+	$(CP) $(DIST_FILES_VKEYBD) wiidist/scummvm/
+endif
 
 wiiloaddist: wiidist
 	cd wiidist && zip -9r scummvm.zip scummvm/
diff --git a/ports.mk b/ports.mk
index cc216c4..3ec042f 100644
--- a/ports.mk
+++ b/ports.mk
@@ -17,7 +17,7 @@ install:
 	$(INSTALL) -d "$(DESTDIR)$(docdir)"
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
 	$(INSTALL) -d "$(DESTDIR)$(datadir)"
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications"
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/appdata"
@@ -39,7 +39,7 @@ install-strip:
 	$(INSTALL) -d "$(DESTDIR)$(docdir)"
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
 	$(INSTALL) -d "$(DESTDIR)$(datadir)"
-	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications"
 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop"
 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/appdata"
@@ -119,6 +119,9 @@ endif
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/Contents/Resources/
 endif
+ifdef DIST_FILES_VKEYBD
+	cp $(DIST_FILES_VKEYBD) $(bundle_name)/Contents/Resources/
+endif
 	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/AUTHORS.rtf
 	rm $(bundle_name)/Contents/Resources/AUTHORS
 	cp $(bundle_name)/Contents/Resources/COPYING.LGPL $(bundle_name)/Contents/Resources/COPYING-LGPL
@@ -145,6 +148,9 @@ endif
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/
 endif
+ifdef DIST_FILES_VKEYBD
+	cp $(DIST_FILES_VKEYBD) $(bundle_name)/
+endif
 	$(STRIP) scummvm
 	ldid -S scummvm
 	chmod 755 scummvm
@@ -256,6 +262,9 @@ endif
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/
 endif
+ifdef DIST_FILES_VKEYBD
+	cp $(DIST_FILES_VKEYBD) $(bundle_name)/
+endif
 	$(STRIP) scummvm
 	ldid -S scummvm
 	chmod 755 scummvm





More information about the Scummvm-git-logs mailing list