diff --git a/GPU/GLES/TextureScaler.cpp b/GPU/GLES/TextureScaler.cpp index c8231203d..f18d07a59 100644 --- a/GPU/GLES/TextureScaler.cpp +++ b/GPU/GLES/TextureScaler.cpp @@ -33,6 +33,11 @@ namespace p = std::tr1::placeholders; namespace p = std::placeholders; #endif +// Hack for Meego +#ifdef MEEGO_EDITION_HARMATTAN +#include "Common/ThreadPool.cpp" +#endif + // Report the time and throughput for each larger scaling operation in the log //#define SCALING_MEASURE_TIME diff --git a/native b/native index 0388a8e23..f9c50c822 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 0388a8e23a2664766503996579dc10511b1db524 +Subproject commit f9c50c822a9a12bcd3952dda58876d1fc2afa2a9