Merge pull request #1691 from dumganhar/gles20

issue #1583: Made WatermelonWithMe works all platforms(iOS,android and win32). Updated the submodule reference of cocos2d-js-tests.
cocos2d · Dec 2, 2012 · 7e5421a · 7e5421a
2 parents 2a8654a + ee0f6d1
commit 7e5421a
Show file tree

Hide file tree

Showing 5 changed files with 497 additions and 81 deletions.
diff --git a/samples/TestJavascript/cocos2d-js-tests b/samples/TestJavascript/cocos2d-js-tests
diff --git a/samples/WatermelonWithMe/proj.android/build_native.sh b/samples/WatermelonWithMe/proj.android/build_native.sh
@@ -48,6 +48,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 COCOS2DX_ROOT="$DIR/../../.."
 APP_ROOT="$DIR/.."
 APP_ANDROID_ROOT="$DIR"
+RESROUCE_ROOT="$APP_ROOT/../TestJavascript/cocos2d-js-tests/games/WatermelonWithMe"
+BINDINGS_JS_ROOT="$APP_ROOT/../../scripting/javascript/bindings/js"
 
 echo
 echo "Paths"
@@ -68,13 +70,10 @@ fi
 mkdir "$APP_ANDROID_ROOT"/assets
 
 # copy "Resources" into "assets"
-find "$APP_ROOT"/Resources -type f -name '*.*' -exec cp -f {} "$APP_ANDROID_ROOT"/assets \;
-
-# copy *.js from WatermelonWithMe into assets' root
-cp -rf "$APP_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
+find "$RESROUCE_ROOT" -type f -name '*.*' -exec cp -f {} "$APP_ANDROID_ROOT"/assets \;
 
 # copy bindings/*.js into assets' root
-cp -f "$APP_ROOT"/bindings/*.js "$APP_ANDROID_ROOT"/assets
+cp -f "$BINDINGS_JS_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
 
 echo "Using prebuilt externals"
 echo

diff --git a/samples/WatermelonWithMe/proj.ios/Info.plist b/samples/WatermelonWithMe/proj.ios/Info.plist
@@ -61,8 +61,8 @@
 	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>