theuni

diff --git a/tools/android/depends/Makefile.include.in b/tools/android/depends/Makefile.include.in
index a209546..67e4022 100644
--- a/tools/android/depends/Makefile.include.in
+++ b/tools/android/depends/Makefile.include.in
@@ -70,6 +70,7 @@ ifneq ($(NATIVE_BUILD),1)
   export ACLOCAL_PATH=$(PREFIX)/share/aclocal:$(NATIVEPREFIX)/share/aclocal
   export LIBTOOLIZE=$(NATIVEPREFIX)/bin/libtoolize
   export AUTORECONF=$(NATIVEPREFIX)/bin/autoreconf
+  export CMAKE=$(NATIVEPREFIX)/bin/cmake
 else

theuni

diff --git a/lib/libsquish/Makefile.in b/lib/libsquish/Makefile.in
index f7b3cc1..34f93bd 100644
--- a/lib/libsquish/Makefile.in
+++ b/lib/libsquish/Makefile.in
@@ -12,11 +12,6 @@ SRCS= \
   squish.cpp
 
 CXXFLAGS+=-I.
-ifeq ($(findstring powerpc,$(ARCH)),powerpc)
-  CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec

theuni

diff --git a/xbmc/linux/HALManager.cpp b/xbmc/linux/HALManager.cpp
index b409af8..baf2db3 100644
--- a/xbmc/linux/HALManager.cpp
+++ b/xbmc/linux/HALManager.cpp
@@ -30,6 +30,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "powermanagement/PowerManager.h"
 #include "settings/AdvancedSettings.h"
+#include "dialogs/GUIDialogKaiToast.h"
 

theuni

CPP     Application.o
In file included from interfaces/json-rpc/JSONRPC.h:31,
                 from Application.cpp:133:
interfaces/json-rpc/JSONUtils.h: In static member function ‘static int JSONRPC::CJSONUtils::Compare(const Json::Value&, const Json::Value&)’:
interfaces/json-rpc/JSONUtils.h:505: error: conversion from ‘long int’ to ‘const Json::Value’ is ambiguous
/scratch/xbmc/lib/jsoncpp/include/json/value.h:237: note: candidates are: Json::Value::Value(bool)
/scratch/xbmc/lib/jsoncpp/include/json/value.h:220: note:                 Json::Value::Value(const char*)
/scratch/xbmc/lib/jsoncpp/include/json/value.h:219: note:                 Json::Value::Value(double)
/scratch/xbmc/lib/jsoncpp/include/json/value.h:217: note:                 Json::Value::Value(Json::UInt64)
/scratch/xbmc/lib/jsoncpp/include/json/value.h:216: note:                 Json::Value::Value(Json::Int64)

theuni

CPP     AudioLibrary.o
In file included from JSONRPC.h:31,
                 from AudioLibrary.h:24,
                 from AudioLibrary.cpp:22:
JSONUtils.h: In static member function ‘static int JSONRPC::CJSONUtils::Compare(const Json::Value&, const Json::Value&)’:
JSONUtils.h:505: error: conversion from ‘long int’ to ‘const Json::Value’ is ambiguous
/scratch/xbmc/lib/jsoncpp/include/json/value.h:237: note: candidates are: Json::Value::Value(bool)
/scratch/xbmc/lib/jsoncpp/include/json/value.h:220: note:                 Json::Value::Value(const char*)
/scratch/xbmc/lib/jsoncpp/include/json/value.h:219: note:                 Json::Value::Value(double)
/scratch/xbmc/lib/jsoncpp/include/json/value.h:217: note:                 Json::Value::Value(Json::UInt64)