[Scummvm-cvs-logs] scummvm master -> fe7ca47ed3f8b0f5a957ec09fa731ff6015cbdf0
sev-
sev at scummvm.org
Wed Feb 24 19:01:41 CET 2016
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
cadc46409f CONFIGURE: Remove trailing spaces
76a27626bd CONFIGURE: Fix for latest gcw0 toolchain
fe7ca47ed3 GCW0: Include free soundfont into release package
Commit: cadc46409f05ebfe8f89b1ec42cbe8e190d65110
https://github.com/scummvm/scummvm/commit/cadc46409f05ebfe8f89b1ec42cbe8e190d65110
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-24T18:52:29+01:00
Commit Message:
CONFIGURE: Remove trailing spaces
Changed paths:
configure
diff --git a/configure b/configure
index 9254c83..222d76f 100755
--- a/configure
+++ b/configure
@@ -593,7 +593,7 @@ engine_enable() {
parent=`get_subengine_parent ${engine}`
if test `get_engine_build ${parent}` = "no" ; then
set_var _engine_${parent}_build "yes"
- fi
+ fi
fi
if test "$opt" = "static" -o "$opt" = "dynamic" -o "$opt" = "yes" ; then
@@ -903,7 +903,7 @@ Game engines:
--disable-all-engines disable all engines
--enable-engine=<engine name>[,<engine name>...] enable engine(s) listed
--disable-engine=<engine name>[,<engine name>...] disable engine(s) listed
- --enable-engine-static=<engine name>[,<engine name>...]
+ --enable-engine-static=<engine name>[,<engine name>...]
enable engine(s) listed as static builtin (when plugins are enabled)
--enable-engine-dynamic=<engine name>[,<engine name>...]
enable engine(s) listed as dynamic plugin (when plugins are enabled)
@@ -2283,7 +2283,7 @@ case $_host_os in
LDFLAGS="-L${macport_prefix}/lib $LDFLAGS"
CXXFLAGS="-I${macport_prefix}/include $CXXFLAGS"
-
+
if test -z "$_staticlibpath"; then
_staticlibpath=${macport_prefix}
echo "Set staticlib-prefix to ${_staticlibpath}"
@@ -2604,7 +2604,7 @@ if test -n "$_host"; then
_mt32emu=no
_optimization_level=-O3
# Disable alsa midi to get the port build on OpenDingux toolchain
- _alsa=no
+ _alsa=no
_vkeybd=yes
_build_hq_scalers=no
_keymapper=no
@@ -2631,7 +2631,7 @@ if test -n "$_host"; then
_eventrec=no
_build_scalers=no
_build_hq_scalers=no
- # We prefer SDL2 on the Raspberry Pi: acceleration now depends on it
+ # We prefer SDL2 on the Raspberry Pi: acceleration now depends on it
# since SDL2 manages dispmanx/GLES2 very well internally.
# SDL1 is bit-rotten on this platform.
_sdlconfig=sdl2-config
@@ -2696,7 +2696,7 @@ if test -n "$_host"; then
add_line_to_config_h "/* #define DEBUG_WII_GDB */"
add_line_to_config_h "#define USE_WII_DI"
;;
- gcw0)
+ gcw0)
append_var DEFINES "-DDINGUX -DGCW0"
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
append_var CXXFLAGS "-mips32"
@@ -2771,7 +2771,7 @@ if test -n "$_host"; then
append_var INCLUDES "-I/usr/X11R6/include"
append_var LIBS "-lX11"
append_var LIBS "-L/usr/lib"
-
+
_backend="maemo"
_vkeybd=yes
_keymapper=yes
@@ -3899,7 +3899,7 @@ fi
echo "$_sparkle"
#
-# Check for FluidSynth
+# Check for FluidSynth
#
echocheck "FluidSynth"
Commit: 76a27626bda983671aa91c2577b603e1f2957662
https://github.com/scummvm/scummvm/commit/76a27626bda983671aa91c2577b603e1f2957662
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-24T18:54:03+01:00
Commit Message:
CONFIGURE: Fix for latest gcw0 toolchain
Changed paths:
configure
diff --git a/configure b/configure
index 222d76f..6bc0e85 100755
--- a/configure
+++ b/configure
@@ -2697,6 +2697,8 @@ if test -n "$_host"; then
add_line_to_config_h "#define USE_WII_DI"
;;
gcw0)
+ _sysroot=`$CXX --print-sysroot`
+ _sdlpath=$_sysroot/usr/bin
append_var DEFINES "-DDINGUX -DGCW0"
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
append_var CXXFLAGS "-mips32"
Commit: fe7ca47ed3f8b0f5a957ec09fa731ff6015cbdf0
https://github.com/scummvm/scummvm/commit/fe7ca47ed3f8b0f5a957ec09fa731ff6015cbdf0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-24T19:00:41+01:00
Commit Message:
GCW0: Include free soundfont into release package
Changed paths:
backends/platform/dingux/dingux.mk
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index 1333e89..fce0f1d 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_bundle): all
+$(gcw0_bundle): all GeneralUser\ GS\ FluidSynth\ v1.44.sf2
$(MKDIR) $(gcw0_bundle)
$(CP) $(DIST_FILES_DOCS) $(gcw0_bundle)/
$(MKDIR) $(gcw0_bundle)/themes
@@ -56,6 +56,8 @@ endif
$(CP) $(srcdir)/dists/gcw0/scummvmrc $(gcw0_bundle)/
$(CP) $(srcdir)/dists/gcw0/scummvm.sh $(gcw0_bundle)/
+ $(CP) GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(gcw0_bundle)/
+
gcw0-opk-unstripped: $(gcw0_bundle)
$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
$(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
@@ -65,3 +67,12 @@ gcw-opk: $(gcw0_bundle)
$(STRIP) $(gcw0_bundle)/plugins/*
$(STRIP) $(gcw0_bundle)/scummvm
./dists/gcw0/opk_make.sh -d $(gcw0_bundle) -o scummvm
+
+GeneralUser_GS_1.44-FluidSynth.zip:
+ curl -s http://www.scummvm.org/frs/extras/SoundFont/GeneralUser_GS_1.44-FluidSynth.zip -o GeneralUser_GS_1.44-FluidSynth.zip
+
+GeneralUser\ GS\ FluidSynth\ v1.44.sf2: GeneralUser_GS_1.44-FluidSynth.zip
+ unzip GeneralUser_GS_1.44-FluidSynth.zip
+ mv "GeneralUser GS 1.44 FluidSynth/GeneralUser GS FluidSynth v1.44.sf2" .
+ mv "GeneralUser GS 1.44 FluidSynth/README.txt" README.soundfont
+ mv "GeneralUser GS 1.44 FluidSynth/LICENSE.txt" LICENSE.soundfont
More information about the Scummvm-git-logs
mailing list