Merge branch 'move-src-to-oxygine' into new-render

Android.mk

@@ -39,7 +39,7 @@ LOCAL_SRC_FILES := \
 				$(wildcard $(SRC)/*.cpp) \
 				)
 
-SRC := oxygine/src
+SRC := oxygine/src/oxygine
 
 LOCAL_SRC_FILES += \
 				$(SRC)/core/android/jniUtils.cpp \

examples/Demo/src/TestPerf.h

@@ -49,7 +49,7 @@ public:
                 spSprite sprite = new Sprite;
                 sprite->setResAnim(resources.getResAnim("anim"));
                 sprite->setAnchor(Vector2(0.5f, 0.5f));
-                sprite->setScale(0.05f);
+                sprite->setSize(getStage()->getSize()/20);
                 sprite->setPosition(scalar::randFloat(0, (float)getWidth()), scalar::randFloat(0, (float)getHeight()));
                 content->addChild(sprite);
             }

oxygine/src/oxygine/core/android/HttpRequestJavaTask.cpp

@@ -1,5 +1,5 @@
 #include "HttpRequestJavaTask.h"
-#include "../core/log.h"
+#include "../log.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/android/jniUtils.cpp

@@ -1,7 +1,7 @@
 #include "jniUtils.h"
 #include "jniHelper.h"
-#include "../core/log.h"
-#include "../core/ThreadDispatcher.h"
+#include "../log.h"
+#include "../ThreadDispatcher.h"
 
 using namespace oxygine;