Using latest love-android branch (9a508a54700d)

This commit is contained in:
fysx
2015-08-13 11:12:17 +02:00
parent c91dbb6957
commit f3dd769e98
63 changed files with 738 additions and 556 deletions
@@ -157,8 +157,8 @@ public:
/**
* Creates an Image object with padding and/or optimization.
**/
Image *newImage(love::image::ImageData *data, const Image::Flags &flags);
Image *newImage(love::image::CompressedImageData *cdata, const Image::Flags &flags);
Image *newImage(const std::vector<love::image::ImageData *> &data, const Image::Flags &flags);
Image *newImage(const std::vector<love::image::CompressedImageData *> &cdata, const Image::Flags &flags);
Quad *newQuad(Quad::Viewport v, float sw, float sh);
@@ -508,7 +508,7 @@ private:
void checkSetDefaultFont();
love::window::Window *currentWindow;
StrongRef<love::window::Window> currentWindow;
StrongRef<Font> defaultFont;