Browse Source

Fixed compilation when building for Android.

Martin Felis 10 years ago
parent
commit
1ea54042e3

+ 1 - 0
src/libraries/Box2D/Common/b2BlockAllocator.cpp

@@ -20,6 +20,7 @@
 #include <limits.h>
 #include <string.h>
 #include <stddef.h>
+#include <cstring>
 
 int32 b2BlockAllocator::s_blockSizes[b2_blockSizes] = 
 {

+ 10 - 0
src/modules/graphics/opengl/Image.cpp

@@ -26,6 +26,16 @@
 // STD
 #include <algorithm> // for min/max
 
+#ifdef LOVE_ANDROID
+// log2 is not declared in the math.h shipped with the Android NDK
+#include <cmath>
+inline double log2( double n )  
+{ 
+	// log(n)/log(2) is log2.  
+	return std::log( n ) / std::log( 2 );  
+}
+#endif
+
 namespace love
 {
 namespace graphics

+ 5 - 1
src/modules/sound/lullaby/ModPlugDecoder.h

@@ -29,8 +29,12 @@
 #include "common/Data.h"
 #include "Decoder.h"
 
-// SDL_sound
+// libmodplug
+#ifdef LOVE_ANDROID
+#include <modplug.h>
+#else
 #include <libmodplug/modplug.h>
+#endif
 
 namespace love
 {