[Scummvm-cvs-logs] scummvm master -> 44c24f8dc81d3bdc5838642ecc88067f6e60b6fd

[anotherguest]

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:
ed357a6dfa SYMBIAN OS:Forgot to set Mpeg2Lib decoder lib.
44947f5bdb Merge branch 'master' of github.com:scummvm/scummvm
44c24f8dc8 SYMBIAN OS:Use defaults for data types also for Symbian OS!


Commit: ed357a6dfacd2fd41366d2baf61bd344fec9a0a0
    https://github.com/scummvm/scummvm/commit/ed357a6dfacd2fd41366d2baf61bd344fec9a0a0
Author: anotherguest (larspson at gmail.com)
Date: 2013-11-26T03:14:18-08:00

Commit Message:
SYMBIAN OS:Forgot to set Mpeg2Lib decoder lib.

Changed paths:
    backends/platform/symbian/BuildPackageUpload_LocalSettings.pl



diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index ba4b11c..4ff485b 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -61,6 +61,7 @@
 		'flac'		=> 'libflacdec.lib',
 		'freetype2'		=> 'freetype.lib',
 		'faad'		=> 'libFAAD2.lib',
+		'mpeg2'	=>  'libmpeg2.lib'
 	);
 		# 'mpeg2'	=>  'libmpeg2.lib'
 


Commit: 44947f5bdb45095793f1e994385f051d534d53ee
    https://github.com/scummvm/scummvm/commit/44947f5bdb45095793f1e994385f051d534d53ee
Author: anotherguest (larspson at gmail.com)
Date: 2013-11-26T03:14:38-08:00

Commit Message:
Merge branch 'master' of github.com:scummvm/scummvm

Changed paths:
  A common/ustr.cpp
  A common/ustr.h
  A engines/agi/configure.engine
  A engines/agos/configure.engine
  A engines/avalanche/configure.engine
  A engines/cge/configure.engine
  A engines/cine/configure.engine
  A engines/composer/configure.engine
  A engines/cruise/configure.engine
  A engines/draci/configure.engine
  A engines/drascula/configure.engine
  A engines/dreamweb/configure.engine
  A engines/fullpipe/configure.engine
  A engines/gob/configure.engine
  A engines/groovie/configure.engine
  A engines/hopkins/configure.engine
  A engines/hugo/configure.engine
  A engines/kyra/configure.engine
  A engines/lastexpress/configure.engine
  A engines/lure/configure.engine
  A engines/made/configure.engine
  A engines/mohawk/configure.engine
  A engines/mortevielle/configure.engine
  A engines/neverhood/configure.engine
  A engines/parallaction/configure.engine
  A engines/pegasus/configure.engine
  A engines/queen/configure.engine
  A engines/saga/configure.engine
  A engines/sci/configure.engine
  A engines/scumm/configure.engine
  A engines/sky/configure.engine
  A engines/sword1/configure.engine
  A engines/sword2/configure.engine
  A engines/sword25/configure.engine
  A engines/teenagent/configure.engine
  A engines/testbed/configure.engine
  A engines/tinsel/configure.engine
  A engines/toltecs/configure.engine
  A engines/tony/configure.engine
  A engines/toon/configure.engine
  A engines/touche/configure.engine
  A engines/tsage/configure.engine
  A engines/tucker/configure.engine
  A engines/wintermute/configure.engine
  A engines/zvision/configure.engine
  R engines/configure.engines
  R engines/engines.mk
  R engines/plugins_table.h
    .gitignore
    Makefile
    Makefile.common
    common/module.mk
    common/str.h
    configure
    devtools/create_project/codeblocks.cpp
    devtools/create_project/config.h
    devtools/create_project/create_project.cpp
    devtools/create_project/create_project.h
    devtools/create_project/msbuild.cpp
    devtools/create_project/visualstudio.cpp
    devtools/create_project/xcode.cpp
    engines/groovie/font.cpp
    engines/groovie/font.h
    engines/wintermute/base/font/base_font_truetype.cpp
    engines/wintermute/base/font/base_font_truetype.h
    engines/wintermute/base/scriptables/script_ext_string.cpp
    engines/wintermute/dctypes.h
    engines/wintermute/utils/string_util.cpp
    engines/wintermute/utils/string_util.h
    graphics/font.cpp
    graphics/font.h
    graphics/fonts/bdf.cpp
    graphics/fonts/bdf.h
    graphics/fonts/ttf.cpp
    graphics/fonts/winfont.cpp
    graphics/fonts/winfont.h
    ports.mk





Commit: 44c24f8dc81d3bdc5838642ecc88067f6e60b6fd
    https://github.com/scummvm/scummvm/commit/44c24f8dc81d3bdc5838642ecc88067f6e60b6fd
Author: anotherguest (larspson at gmail.com)
Date: 2013-11-26T03:17:59-08:00

Commit Message:
SYMBIAN OS:Use defaults for data types also for Symbian OS!

Changed paths:
    video/codecs/mpeg.h



diff --git a/video/codecs/mpeg.h b/video/codecs/mpeg.h
index 0082844..3560f4b 100644
--- a/video/codecs/mpeg.h
+++ b/video/codecs/mpeg.h
@@ -37,7 +37,7 @@
 	typedef signed short int16_t;
 	typedef unsigned char uint8_t;
 	typedef unsigned short uint16_t;
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) || defined (__SYMBIAN32__)
 	typedef signed char int8_t;
 	typedef signed short int16_t;
 	typedef unsigned char uint8_t;