[Scummvm-cvs-logs] scummvm master -> d1169beed169a906925ee078fd7439ac455c8b97
sev-
sev at scummvm.org
Sun Oct 26 19:33:57 CET 2014
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f5e273ded9 GCW0: Create log file at game launch
293a0d0046 GCW0: Create target with unstripped binaries
6046863fdd BASE: Display virtual keyboard and keymapper in game options
d1169beed1 CONFIGURE: Create port-specific platform for GCW0
Commit: f5e273ded942d2de09be4673cc6b6f136d6ed1e3
https://github.com/scummvm/scummvm/commit/f5e273ded942d2de09be4673cc6b6f136d6ed1e3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-26T14:32:47-04:00
Commit Message:
GCW0: Create log file at game launch
Changed paths:
dists/gcw0/scummvm.sh
diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh
index 5ad7a85..4ffb429 100755
--- a/dists/gcw0/scummvm.sh
+++ b/dists/gcw0/scummvm.sh
@@ -6,4 +6,4 @@ if [ ! -f $HOME/.scummvmrc ] ; then
cp /mnt/ScummVM/scummvmrc $HOME/.scummvmrc
fi
-exec ./scummvm
+exec ./scummvm 2>&1 >$HOME/scummvm.log
Commit: 293a0d0046c9f393f741de66a9ffa0dbc06991e2
https://github.com/scummvm/scummvm/commit/293a0d0046c9f393f741de66a9ffa0dbc06991e2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-26T14:32:47-04:00
Commit Message:
GCW0: Create target with unstripped binaries
Changed paths:
backends/platform/dingux/dingux.mk
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index f02801e..1333e89 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -33,7 +33,7 @@ endif
$(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/
# Special target for generationg GCW-Zero OPK bundle
-gcw0-opk: all
+$(gcw0_bundle): all
$(MKDIR) $(gcw0_bundle)
$(CP) $(DIST_FILES_DOCS) $(gcw0_bundle)/
$(MKDIR) $(gcw0_bundle)/themes
@@ -45,9 +45,8 @@ 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) $(EXECUTABLE) $(gcw0_bundle)/scummvm
$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(gcw0_bundle)/
$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(gcw0_bundle)/
@@ -56,5 +55,13 @@ 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)/
+
+gcw0-opk-unstripped: $(gcw0_bundle)
+ $(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
+ $(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
+gcw-opk: $(gcw0_bundle)
+ $(STRIP) $(gcw0_bundle)/plugins/*
+ $(STRIP) $(gcw0_bundle)/scummvm
+ ./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
Commit: 6046863fdd2f5e5d3622c8942ce39ca743857988
https://github.com/scummvm/scummvm/commit/6046863fdd2f5e5d3622c8942ce39ca743857988
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-26T14:32:47-04:00
Commit Message:
BASE: Display virtual keyboard and keymapper in game options
Changed paths:
base/version.cpp
diff --git a/base/version.cpp b/base/version.cpp
index ef02ff9..fcb2740 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -146,4 +146,12 @@ const char *gScummVMFeatures = ""
#ifdef USE_PNG
"PNG "
#endif
+
+#ifdef ENABLE_KEYMAPPER
+ "keymapper "
+#endif
+
+#ifdef ENABLE_VKEYBD
+ "virtual keyboard "
+#endif
;
Commit: d1169beed169a906925ee078fd7439ac455c8b97
https://github.com/scummvm/scummvm/commit/d1169beed169a906925ee078fd7439ac455c8b97
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-26T14:32:47-04:00
Commit Message:
CONFIGURE: Create port-specific platform for GCW0
Changed paths:
configure
diff --git a/configure b/configure
index 5264e32..09b8383 100755
--- a/configure
+++ b/configure
@@ -822,9 +822,9 @@ Usage: $0 [OPTIONS]...
Configuration:
-h, --help display this help and exit
- --backend=BACKEND backend to build (android, tizen, dc, dingux, ds, gph,
- iphone, linuxmoto, maemo, n64, null, openpandora, ps2,
- psp, samsungtv, sdl, webos, wii, wince) [sdl]
+ --backend=BACKEND backend to build (android, tizen, dc, dingux, ds, gcw0,
+ gph, iphone, linuxmoto, maemo, n64, null, openpandora,
+ ps2, psp, samsungtv, sdl, webos, wii, wince) [sdl]
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
@@ -859,6 +859,7 @@ Special configuration feature:
dreamcast for Sega Dreamcast
ds for Nintendo DS
gamecube for Nintendo GameCube
+ gcw0 for GCW Zero
gp2x for GP2X
gp2xwiz for GP2X Wiz
iphone for Apple iPhone
@@ -1298,7 +1299,7 @@ caanoo)
_host_cpu=arm
_host_alias=arm-none-linux-gnueabi
;;
-dingux)
+dingux | gcw0)
_host_os=linux
_host_cpu=mipsel
_host_alias=mipsel-linux
@@ -2588,6 +2589,27 @@ if test -n "$_host"; then
add_line_to_config_h "/* #define DEBUG_WII_GDB */"
add_line_to_config_h "#define USE_WII_DI"
;;
+ gcw0)
+ DEFINES="$DEFINES -DDINGUX"
+ DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+ DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
+ ASFLAGS="$ASFLAGS"
+ CXXFLAGS="$CXXFLAGS -msoft-float"
+ CXXFLAGS="$CXXFLAGS -mips32"
+ _backend="dingux"
+ _mt32emu=no
+ _optimization_level=-O3
+ # Disable alsa midi to get the port build on OpenDingux toolchain
+ _alsa=no
+ _vkeybd=yes
+ _build_hq_scalers=no
+ _keymapper=yes
+ # Force disable vorbis on dingux, it has terrible performance compared to tremor
+ _vorbis=no
+ # Force disable seq on dingux, no way to use it and it would get enabled by default with configure
+ _seq_midi=no
+ _port_mk="backends/platform/dingux/dingux.mk"
+ ;;
gp2x)
DEFINES="$DEFINES -DGP2X"
CXXFLAGS="$CXXFLAGS -march=armv4t"
More information about the Scummvm-git-logs
mailing list