Fixed Android compilation and warnings

src/blitter/16bpp_base.hpp

@@ -217,9 +217,9 @@ public:
 
 		/* Reduce overbright strength */
 		ob /= 2;
-		return Colour16(	r >= 31 ? 31 : min(r + ob * (31 - r) / 32, 31),
-							g >= 63 ? 63 : min(g + ob * (63 - g) / 64, 63),
-							b >= 31 ? 31 : min(b + ob * (31 - b) / 32, 31) );
+		return Colour16(	r >= 31 ? 31 : std::min(r + ob * (31 - r) / 32, 31),
+							g >= 63 ? 63 : std::min(g + ob * (63 - g) / 64, 63),
+							b >= 31 ? 31 : std::min(b + ob * (31 - b) / 32, 31) );
 	}
 };
 

src/blitter/16bpp_simple.cpp

@@ -143,7 +143,7 @@ Sprite *Blitter_16bppSimple::Encode(const SpriteLoader::Sprite *sprite, Allocato
 			dst[i].v = 0;
 		} else {
 			/* Get brightest value */
-			uint8 rgb_max = max(src->r, max(src->g, src->b));
+			uint8 rgb_max = std::max(src->r, std::max(src->g, src->b));
 #if 0
 			/* Pre-convert the mapping channel to a RGB value,
 			   use 32bpp AdjustBrightness() variant for better colors,

src/blitter/CMakeLists.txt

@@ -13,6 +13,10 @@ add_files(
     8bpp_optimized.hpp
     8bpp_simple.cpp
     8bpp_simple.hpp
+    16bpp_base.cpp
+    16bpp_base.hpp
+    16bpp_simple.cpp
+    16bpp_simple.hpp
     CONDITION NOT OPTION_DEDICATED
 )