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

[fingolfin]

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

Summary:
2fd2247ab8 WEBOS: Tweak configure script to simplify support for WebOS on buildbot
cc9ffb58fa BACKENDS: Fix compilation of keymapper code


Commit: 2fd2247ab8045f2e565c2b54e18edcb758834160
    https://github.com/scummvm/scummvm/commit/2fd2247ab8045f2e565c2b54e18edcb758834160
Author: Max Horn (max at quendi.de)
Date: 2011-04-29T03:54:10-07:00

Commit Message:
WEBOS: Tweak configure script to simplify support for WebOS on buildbot

Changed paths:
    configure



diff --git a/configure b/configure
index 399fd42..2965d09 100755
--- a/configure
+++ b/configure
@@ -1672,6 +1672,7 @@ case $_host_os in
 		_unix=yes
 		;;
 	webos)
+		CXXFLAGS="$CXXFLAGS -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
 		LDFLAGS="$LDFLAGS -L$WEBOS_PDK/device/lib -L$WEBOS_PDK/device/usr/lib"
 		LDFLAGS="$LDFLAGS -Wl,--allow-shlib-undefined"
 		LDFLAGS="$LDFLAGS --sysroot=$WEBOS_PDK/arm-gcc/sysroot"
@@ -3109,7 +3110,6 @@ case $_backend in
 		DEFINES="$DEFINES -DSDL_BACKEND"
 		;;
 	webos)
-		INCLUDES="$INCLUDES -I$WEBOS_PDK/include -I$WEBOS_PDK/include/SDL -I$WEBOS_PDK/device/usr/include"
 		LIBS="$LIBS -lSDL -lpdl"
 		DEFINES="$DEFINES -DSDL_BACKEND -DWEBOS"
 		MODULES="$MODULES backends/platform/sdl"


Commit: cc9ffb58faa4a34228dd12826989e74804269b10
    https://github.com/scummvm/scummvm/commit/cc9ffb58faa4a34228dd12826989e74804269b10
Author: Max Horn (max at quendi.de)
Date: 2011-04-29T03:54:10-07:00

Commit Message:
BACKENDS: Fix compilation of keymapper code

Changed paths:
    backends/keymapper/hardware-key.h



diff --git a/backends/keymapper/hardware-key.h b/backends/keymapper/hardware-key.h
index 7c608a5..b6d9dbf 100644
--- a/backends/keymapper/hardware-key.h
+++ b/backends/keymapper/hardware-key.h
@@ -31,6 +31,7 @@
 #ifdef ENABLE_KEYMAPPER
 
 #include "backends/keymapper/types.h"
+#include "common/textconsole.h"
 
 namespace Common {