cocos2d · pandamicro · Dec 31, 2014 · Nov 5, 2014 · Nov 5, 2014 · Nov 6, 2014
diff --git a/AUTHORS b/AUTHORS
@@ -58,10 +58,17 @@ tkowalski           @tkowalski      Add missing affine transform functions renam
 Minh Quy            @MQuy           Fix url matching regex issue
 
 Park Hyun Chen      @sincntx        Fix cc.ScrollView constructor issue in JSB
+                                    Added cc.rectOverlapsRect function in JSB
 
 Vincent Chou        @go3k           Update README.md, add submodule update command suggestion
                                     Fix bug: Runtime.cpp protobuf object parseFromString may result in an incomplete protobuf object
+                                    Fix bug: PrebuiltRuntime ios version can't support portrait orientation.
 
+Igor Mats           @IgorMats       Added outline shader sample
+
+G17hao              @G17hao         Fixed an typo issue in jsb_boot.js
+
+Simon de Lang       @simondel       Fixed use of deprecated cc, ccs and ccui create functions.
 
 Cocos2d-JS can not grow so fast without the active community.
 Thanks to all developers who report & trace bugs, discuss the engine usage in forum & QQ groups!

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,83 @@
 ChangeLog:
 
+Cocos2d-JS v3.2 @ Dec.29, 2014
+
+* Replaced `transform` function with `setTransform` function under canvas render mode for better performance.
+* Added a timer in `cc.audioEngine` to check audio element loading event, prevent the loading process being stucked when load audio file failed.
+* Added some new browser types to `cc.sys`.
+* Added some audio resource loading codes to ensure compatibility with Wechat browser.
+* Added check for WebAudio support to ensure compatibility.
+* [JSB]Upgraded Cocos2d-x to v3.3 Final.
+* [JSB]Added `getSearchPaths` API to `jsb.Manifest` to support better script hot update.
+* [JSB]Polished restart game feature.
+* [JSB]Added a sample usage case for `jsb.AssetsManager`'s script hot update ability.
+* [JSB]Skipped FlatBuffer related bindings.
+* [JSB]Canceled modifications in Spine due to License restriction and removed new constructor for `sp.SkeletonAnimation`.
+
+* Bug fixes:
+    1. Fixed an issue that `cc.InputManager` doesn't trigger touch event on chrome mobile emulator.
+	2. Fixed an issue that `cc.game.setFrameRate` doesn't work.
+	3. Fixed an issue that `cc.view` can't remove resize event listener.
+	4. Fixed an issue that `cc.EventManager` didn't set register flag to false when a listener is removed.
+	5. Fixed an issue that `cc.audioEngine` doesn't play some audios on some iOS devices.
+	6. Fixed an issue of ccui controls that their `setColor` doesn't work when cascade color is enabled.
+	7. Fixed an issue that `ccs.Armature`'s `setColor` doesn't work in canvas render mode.
+	8. Fixed an issue that `ccs.Armature` crashes when adding a child to it.
+	9. Fixed an issue that `cc.SpriteBatchNode`'s status is incorrect in WebGL render mode.
+	10. Fixed an issue of `cc.Layer` that its position is incorrect under bake mode.
+	11. Fixed an issue of `ccui.RichText` that its `setContentSize` doesn't work.
+	12. Fixed an issue of `cc.LabelTTF` that its `setColor` doesn't work when cascade color is enabled.
+	13. Fixed an issue of spine that its skeletons position is incorrect when scaleX equals to -1 and scaleY equals to 1.
+    14. Fixed `sp.Skeleton`'s API inconsistence by renaming `boundingBox` to `getBoundingBox`.
+    15. Removed all usages of deprecated create functions in the test cases.
+	16. [JSB]Fixed an issue of `ccui.ScrollView`'s `innerWidth` and `innerHeight` properties.
+    17. [JSB]Fixed an issue that setting `cc.Node`'s userData property will crash.
+    18. [JSB]Fixed API inconsistence by renaming `jsb.fileUtils`'s `getByteArrayFromFile` to `getDataFromFile`.
+    19. [JSB]Fixed a script file cache check issue in ScriptingCore.cpp.
+    20. [JSB]Fixed an issue of `ccs.Armature`'s constructore.
+
+Cocos2d-JS v3.2 RC0 @ Dec.11, 2014
+
+* Refactoration of web engine by separating the render logic, the arthictecture level refactoration is now completed and brounght great performance improvement.
+* Refactoration of web engine's resolution adaptation and audio engine with polyfilled adaptation logics for different devices and browsers. This ensures better compatibility and better extensibility for future needs.
+* Added `setRotation` method to `ccui.ImageView`.
+* Added a function that fill sprite with repeated texture in Canvas mode.
+* Added `setLineHeight` method to `cc.LabelTTF`.
+* Added `dumpAudioInfo` to `cc.audioEngine` for debugging purpose on mobile browser.
+* Removed Cocos Studio's Protobuffer support from the framework.
+* Added an outline shader sample.
+* [JSB] Supported modulization for JSB.
+* [JSB] Added restart game feature.
+* [JSB] Bound all missed chipmunk API in JSB and added test cases for new features, fix some potential memory leak issues.
+* [JSB] Added `cc.sys.cleanScript` API to remove a script's cache.
+* [JSB] Upgrade Cocos2d-x to v3.3 RC1.
+* [JSB] Change default Android compiler to gcc.
+* [JSB] Added manual bindings for `cc.Node#pause`.
+* [JSB] Added missing constants and functions.
+
+* Bug fixes:
+	1. Fixed an issue of `cc.Sprite` that its rendering is incorrect without texture.
+	2. Fixed an issue of `cc.ClippingNode` that its stencil drawing is incorrect on Canvas Mode.
+	3. Fixed an issue of `TextFieldReader` that it will throw an error when 'areaWidth' and 'areaHeight' equal to zero.
+	4. Fixed an issue of `ccui.CheckBox` that its getSelectedState doesn't return its state.
+	5. Fixed an issue of `cc.LabelTTF` that it doesn't update the string when its string become to empty string.
+	6. Fixed an issue of `cc.ParticleSystem` that it can't change its texture mode and shape type in Canvas mode.
+	7. Fixed an issue of `cc.Layer`'s bake function that its position is incorrect when cc.view's scale isn't 1.
+	8. Fixed an issue of `ccs.ArmatureAnimation`'s `setMovementEventCallFunc` and `setFrameEventCallFunc`.
+	9. Fixed an issue of `console.log` that it isn't a funtion on IE9.
+	10. Fixed an issue of `CSLoader` that it will add duplicate resources to sprite frame cache.
+	11. Fixed an issue of `cc.ProgressTimer` that its setColor is not taking effect.
+	12. Fixed an issue of `cc.loader` that it will throw an error when loading a remote texture.
+    13. Upgrade html5 version chipmunk to the latest release.
+    14. [JSB] Fixed an issue that the string return value can not be accessed in JavaScript to Objective-C reflection.
+    15. [JSB] Fixed potential memory leaks in JavaScriptJavaBridge.
+    16. [JSB] Fixed libcurl's relocation overflow linker issue in Android release mode.
+    17. [JSB] Fixed an issue of `ccui.CheckBox`'s _ctor function.
+    18. [JSB] Made `cc.MenuSpriteImage`'s set functions support sprite frame name as parameter.
+    19. [JSB] Made ccui's `addEventListener` functions support one argument.
+    20. [JSB] Made `ccs.ArmatureAnimation`'s `setFrameEventCallFunc` and `setMovementEventCallFunc` accepts one parameter.
+    21. [JSB] Made project.json's configs - `frameRate` and `debugMode` take effect in JSB.
+
 Cocos2d-JS v3.1 @ Oct.22, 2014
 
 * Released Facebook Integration for Cocos2d-JS v1.0, all APIs have been significantly polished and stabilized. Improved test cases for Facebook with more features demonstrated.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,23 +23,23 @@
 # ****************************************************************************/
 
 cmake_minimum_required(VERSION 2.8)
-project (Cocos2djs)
+project (Cocos2d-JS)
 
 # The version number
-#set(Cocos2djsSamples_VERSION_MAJOR 3)
-#set(Cocos2djsSamples_VERSION_MINOR 0)
-
-include(frameworks/js-bindings/cocos2d-x/cmake/BuildHelpers.CMakeLists.txt)
+set(Cocos2d_JS_Samples_VERSION_MAJOR 3)
+set(Cocos2d_JS_Samples_VERSION_MINOR 2)
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cmake/Modules/")
+include(CocosBuildHelpers)
 
 option(USE_CHIPMUNK "Use chipmunk for physics library" ON)
 option(USE_BOX2D "Use box2d for physics library" OFF)
 option(DEBUG_MODE "Debug or release?" ON)
-option(BUILD_LIBS_LUA "Build lua libraries" ON)
 option(BUILD_EXTENSIONS "Build extension library" ON)
 option(BUILD_EDITOR_SPINE "Build editor support for spine" ON)
 option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON)
 option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON)
+option(USE_PREBUILT_LIBS "Use prebuilt libraries in external directory" ON)
 
 option(BUILD_JSTests "build TestJS sample" ON)
 option(BUILD_JSMOONWARRIORS "build MoonWarriors sample" ON)
@@ -70,7 +70,7 @@ elseif(APPLE)
 
 
 else()#Linux
-ADD_DEFINITIONS(-DLINUX)
+ADD_DEFINITIONS(-DLINUX -DCC_RESOURCE_FOLDER_LINUX="/")
 endif()
 
 
@@ -111,82 +111,159 @@ else() # Assume Linux
   set(PLATFORM_FOLDER linux)
 endif()
 
+set(COCOS_EXTERNAL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external)
+
+
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x
   ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cocos
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cocos/platform	
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cocos/platform/desktop
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cocos/platform/${PLATFORM_FOLDER}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cocos/audio/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cocos/editor-support
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cocos/scripting/lua-bindings/auto
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cocos/scripting/lua-bindings/manual
+  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/
+  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/deprecated
+  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/cocos/platform
   ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/extensions
   ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/tinyxml2
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/unzip
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/edtaa3func
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/chipmunk/include/chipmunk
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/jpeg/include/${PLATFORM_FOLDER}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/png/include/${PLATFORM_FOLDER}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/tiff/include/${PLATFORM_FOLDER}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/webp/include/${PLATFORM_FOLDER}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/glfw3/include/${PLATFORM_FOLDER}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/freetype2/include/${PLATFORM_FOLDER}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/websockets/include/${PLATFORM_FOLDER}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/xxhash
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/external/spidermonkey/include/${PLATFORM_FOLDER}
 )
 
-if(WIN32)
-  include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/${PLATFORM_FOLDER}-specific/gles/include/OGLES
-    ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/${PLATFORM_FOLDER}-specific/icon/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/${PLATFORM_FOLDER}-specific/zlib/include
-    external/curl/include/${PLATFORM_FOLDER}
-  )
-elseif(APPLE)
-  include_directories(
-  	${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/curl/include/${PLATFORM_FOLDER}
-  )
-else()
-  include_directories(
-    /usr/include
-    /usr/include/GLFW
-    /usr/local/include/GLFW
-    ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/${PLATFORM_FOLDER}-specific/fmod/include/${ARCH_DIR}
-  )
+if(USE_PREBUILT_LIBS)
+  include(CocosUsePrebuiltLibs)
 endif()
 
+# GLFW3 used on Mac, Windows and Linux desktop platforms
+if(LINUX OR MACOSX OR WINDOWS)
+  cocos_find_package(OpenGL OPENGL REQUIRED)
 
+  if(LINUX OR WINDOWS)
+    cocos_find_package(GLEW GLEW REQUIRED)
+  endif()
 
+  cocos_find_package(GLFW3 GLFW3 REQUIRED)
+  include_directories(${GLFW3_INCLUDE_DIRS})
 
-link_directories(
-  /usr/local/lib
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/chipmunk/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/jpeg/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/tiff/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/webp/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/png/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/freetype2/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/websockets/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/${PLATFORM_FOLDER}-specific/fmod/prebuilt/${ARCH_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/external/spidermonkey/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
-)
+  if(LINUX)
+    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+    find_package(Threads REQUIRED)
+    set(THREADS_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+
+    #cocos_find_package(FMODEX FMODEX REQUIRED)
+    cocos_find_package(Fontconfig FONTCONFIG REQUIRED)
+  endif()
+
+  if(WINDOWS)
+    cocos_find_package(Vorbis VORBIS REQUIRED)
+    cocos_find_package(MPG123 MPG123 REQUIRED)
+    cocos_find_package(OpenAL OPENAL REQUIRED)
+    # because FindOpenAL.cmake set include dir for '#include <al.h>' for portability (not for '#include <AL/al.h>'
+    set(OPENAL_DEFINITIONS "-DOPENAL_PLAIN_INCLUDES")
+  endif()
+endif(LINUX OR MACOSX OR WINDOWS)
 
+# Freetype required on all platforms
+cocos_find_package(Freetype FREETYPE REQUIRED)
+
+# WebP required if used
+if(USE_WEBP)
+  cocos_find_package(WebP WEBP REQUIRED)
+endif(USE_WEBP)
+
+# Chipmunk
+if(USE_CHIPMUNK)
+  cocos_find_package(Chipmunk CHIPMUNK REQUIRED)
+  add_definitions(-DCC_ENABLE_CHIPMUNK_INTEGRATION=1)
+  if(IOS OR MACOSX)
+    # without this chipmunk will try to use apple defined geometry types, that conflicts with cocos
+    add_definitions(-DCP_USE_CGPOINTS=0)
+  endif()
+else(USE_CHIPMUNK)
+  add_definitions(-DCC_USE_PHYSICS=0)
+endif(USE_CHIPMUNK)
+
+# Box2d (not prebuilded, exists as source)
+if(USE_BOX2D)
+  if(USE_PREBUILT_LIBS)
+    add_subdirectory(frameworks/js-bindings/cocos2d-x/external/Box2D)
+    set(Box2D_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/box2d/include)
+    set(Box2D_LIBRARIES box2d)
+  else()
+    find_package(Box2D REQUIRED CONFIG)
+    # actually Box2D in next line is not a library, it is target exported from Box2DConfig.cmake
+    set(Box2D_LIBRARIES Box2D)
+  endif()
+  message(STATUS "Box2D include dirs: ${Box2D_INCLUDE_DIRS}")
+  add_definitions(-DCC_ENABLE_BOX2D_INTEGRATION=1)
+else()
+  add_definitions(-DCC_ENABLE_BOX2D_INTEGRATION=0)
+endif(USE_BOX2D)
+
+# Tinyxml2 (not prebuilded, exists as source)
+if(USE_PREBUILT_LIBS)
+  add_subdirectory(frameworks/js-bindings/cocos2d-x/external/tinyxml2)
+  set(TinyXML2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/tinyxml2)
+  set(TinyXML2_LIBRARIES tinyxml2)
+else()
+  cocos_find_package(TinyXML2 TinyXML2 REQUIRED)
+endif()
+message(STATUS "TinyXML2 include dirs: ${TinyXML2_INCLUDE_DIRS}")
+
+# libjpeg
+cocos_find_package(JPEG JPEG REQUIRED)
+cocos_find_package(ZLIB ZLIB REQUIRED)
+
+# minizip (we try to migrate to minizip from https://github.com/nmoinvaz/minizip)
+# only msys2 currently provides package for this variant, all other
+# dists have packages from zlib, thats very old for us.
+# moreover our embedded version modified to quick provide
+# functionality needed by cocos.
+if(USE_PREBUILT_LIBS OR NOT MINGW)
+  add_subdirectory(frameworks/js-bindings/cocos2d-x/external/unzip)
+  set(MINIZIP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/unzip)
+  set(MINIZIP_LIBRARIES unzip)
+  message(STATUS "MINIZIP include dirs: ${MINIZIP_INCLUDE_DIRS}")
+else()
+  cocos_find_package(MINIZIP MINIZIP REQUIRED)
+  # double check that we have needed functions
+  include(CheckLibraryExists)
+  check_library_exists(${MINIZIP_LIBRARIES} "unzGoToFirstFile2" "" MINIZIP_HAS_GOTOFIRSTFILE2)
+  if(NOT MINIZIP_HAS_GOTOFIRSTFILE2)
+    message(FATAL_ERROR "Minizip library on you system very old. Please use recent version from https://github.com/nmoinvaz/minizip or enable USE_PREBUILT_LIBS")
+  endif()
+  add_definitions(-DMINIZIP_FROM_SYSTEM)
+endif()
+
+cocos_find_package(PNG PNG REQUIRED)
+cocos_find_package(TIFF TIFF REQUIRED)
+cocos_find_package(WEBSOCKETS WEBSOCKETS REQUIRED)
+cocos_find_package(CURL CURL REQUIRED)
+
+# protobuf-lite (not prebuilded, exists as source)
+# TODO: for now we can't use upstream protobuf because these files:
+#  cocos/editor-support/cocostudio/CSParseBinary.pb.h
+#  cocos/editor-support/cocostudio/CSParseBinary.pb.cc
+# was generated by concrete version of protobuf compiler
+# and source file not provided. So these files can be
+# compiled only with our in-source version of protobuf-lite
+## if(USE_PREBUILT_LIBS)
+  add_subdirectory(frameworks/js-bindings/cocos2d-x/external/protobuf-lite)
+  set(PROTOBUF_LITE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/cocos2d-x/external/protobuf-lite/src)
+  set(PROTOBUF_LITE_LIBRARIES protobuf)
+## else()
+##  cocos_find_package(Protobuf REQUIRED PROTOBUF_LITE_LIBRARIES)
+##  set(PROTOBUF_LITE_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
+## endif()
+message(STATUS "Protobuf lite libs: ${PROTOBUF_LITE_LIBRARIES}")
+message(STATUS "Protobuf include dirs: ${PROTOBUF_LITE_INCLUDE_DIRS}")
 
 # build for 3rd party libraries
 if(LINUX OR APPLE)
-add_subdirectory(frameworks/js-bindings/cocos2d-x/external/Box2D)
-add_subdirectory(frameworks/js-bindings/cocos2d-x/external/unzip)
 add_subdirectory(frameworks/js-bindings/cocos2d-x/external/xxhash)
-add_subdirectory(frameworks/js-bindings/cocos2d-x/external/tinyxml2)
-add_subdirectory(frameworks/js-bindings/cocos2d-x/external/protobuf-lite)
 endif()
 
 # cocos2d library
 add_subdirectory(frameworks/js-bindings/cocos2d-x/cocos)
 
+link_directories(
+  /usr/local/lib
+  ${CMAKE_CURRENT_SOURCE_DIR}/frameworks/js-bindings/external/spidermonkey/prebuilt/${PLATFORM_FOLDER}/${ARCH_DIR}
+)
+
 # jsbindings library
 add_subdirectory(frameworks/js-bindings/bindings)
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img src="http://www.cocos2d-x.org/attachments/1508/2dh5-logo.png" width=200>
+<img src="http://www.cocos2d-x.org/attachments/801/cocos2dx_portrait.png" width=200>
 
 Cocos2d-JS
 ===========
@@ -39,7 +39,7 @@ Furthermore, JavaScript friendly APIs make your game development experience a br
 
 - Cocos2d-JS v3.0 uses Cocos2d-x 3.2 final as base of JSB solution
 - Cocos2d-JS v3.0 is compatible with Cocos Code IDE v1.0.0 RC2+
-- Cocos2d-JS v3.0 is compatible with Cocos Studio v1.2 - v1.5.0.1
+- Cocos2d-JS v3.0 is compatible with Cocos Studio v1.2 - v2.0
 
 With any problems you might have, our communities are happy to help: