Merge pull request #2486 from minggo/master

fix some bugs

samples/Cpp/AssetsManagerTest/proj.ios/AssetsManagerTest.xcodeproj/project.pbxproj

@@ -948,6 +948,7 @@
 					"$(SRCROOT)/../../../../extensions",
 				);
 				INFOPLIST_FILE = Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../../../..//cocos2dx/platform/third_party/ios/libraries\"",
@@ -956,7 +957,6 @@
 					"\"$(SRCROOT)/../../../../scripting/javascript/spidermonkey-ios/lib\"",
 				);
 				OTHER_LDFLAGS = (
-					"-lxml2",
 					"-lz",
 					"-lsqlite3",
 				);
@@ -993,6 +993,7 @@
 					"$(SRCROOT)/../../../../extensions",
 				);
 				INFOPLIST_FILE = Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../../../..//cocos2dx/platform/third_party/ios/libraries\"",
@@ -1001,7 +1002,6 @@
 					"\"$(SRCROOT)/../../../../scripting/javascript/spidermonkey-ios/lib\"",
 				);
 				OTHER_LDFLAGS = (
-					"-lxml2",
 					"-lz",
 					"-lsqlite3",
 				);

samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp

@@ -3,6 +3,8 @@
 #include <jni.h>
 #include <android/log.h>
 
+#include "cocos2d.h"
+
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 

samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp

@@ -36,6 +36,8 @@ bool AppDelegate::applicationDidFinishLaunching()
     // set FPS. the default value is 1.0/60 if you don't call this
     pDirector->setAnimationInterval(1.0 / 60);
     
+    CCEGLView::sharedOpenGLView()->setDesignResolutionSize(480, 320, kResolutionFixedHeight);
+    
     ScriptingCore* sc = ScriptingCore::getInstance();
     sc->addRegisterCallback(register_all_cocos2dx);
     sc->addRegisterCallback(register_all_cocos2dx_extension);

samples/Lua/TestLua/proj.ios/TestLua.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-2df11c451f673012830a4b40578ec2fe9946f768
+787967eac1074652820df1aff330aea90a904788