Merge pull request #332 from cocos/v3.7

V3.7
2023-01-06 12:10:45 +08:00 · 2023-01-06 12:10:45 +08:00 · 9a8d34c93b
parent 23cbc65185 ce540f2517
commit 9a8d34c93b
17 changed files with 7 additions and 4 deletions
--- a/android/arm64-v8a/ar/libar.a
+++ b/android/arm64-v8a/ar/libar.a
--- a/android/arm64-v8a/xr/huaweivr/libxr.a
+++ b/android/arm64-v8a/xr/huaweivr/libxr.a
--- a/android/arm64-v8a/xr/meta/libxr.a
+++ b/android/arm64-v8a/xr/meta/libxr.a
--- a/android/arm64-v8a/xr/monado/libxr.a
+++ b/android/arm64-v8a/xr/monado/libxr.a
--- a/android/arm64-v8a/xr/pico/libxr.a
+++ b/android/arm64-v8a/xr/pico/libxr.a
--- a/android/arm64-v8a/xr/rokid/libxr.a
+++ b/android/arm64-v8a/xr/rokid/libxr.a
--- a/android/arm64-v8a/xr/spaces/libxr.a
+++ b/android/arm64-v8a/xr/spaces/libxr.a
--- a/android/armeabi-v7a/ar/libar.a
+++ b/android/armeabi-v7a/ar/libar.a
--- a/android/x86_64/xr/monado/libxr.a
+++ b/android/x86_64/xr/monado/libxr.a
--- a/ios/libs/ar/libar.a
+++ b/ios/libs/ar/libar.a
--- a/linux/bin/swig/bin/swig
+++ b/linux/bin/swig/bin/swig
--- a/linux/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
+++ b/linux/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
@ -278,6 +278,7 @@ SE_DECLARE_FINALIZE_FUNC(js_delete_$jsdtor) %}
 %{
 bool js_register_$jsmangledname(se::Object* obj) {
    $jsclass_inheritance
+    cls->defineStaticProperty("__isJSB", se::Value(true), se::PropertyAttribute::READ_ONLY | se::PropertyAttribute::DONT_ENUM | se::PropertyAttribute::DONT_DELETE);
    $jsclassvariables
    $jsclassfunctions
    $jsstaticclassvariables
--- a/mac/bin/swig/bin/swig
+++ b/mac/bin/swig/bin/swig
--- a/mac/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
+++ b/mac/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
@ -278,6 +278,7 @@ SE_DECLARE_FINALIZE_FUNC(js_delete_$jsdtor) %}
 %{
 bool js_register_$jsmangledname(se::Object* obj) {
    $jsclass_inheritance
+    cls->defineStaticProperty("__isJSB", se::Value(true), se::PropertyAttribute::READ_ONLY | se::PropertyAttribute::DONT_ENUM | se::PropertyAttribute::DONT_DELETE);
    $jsclassvariables
    $jsclassfunctions
    $jsstaticclassvariables
--- a/versions.txt
+++ b/versions.txt
@ -131,7 +131,7 @@ glslang (Built using https://github.com/YunHsiao/glslang/tree/build)
    ios:        11.5.0 (commit: 1978c76)
    linux:      11.5.0
    
-swig (Built using https://github.com/dumganhar/swig/tree/cocos-se)
-    win64:      cocos-v1.1.0 (commit: fac0dbb)
-    mac:        cocos-v1.1.0 (commit: fac0dbb)
-    linux:      cocos-v1.1.0 (commit: fac0dbb)
+swig ( Built using https://github.com/cocos/swig/tree/cocos-se, executable files are downloaded from https://github.com/cocos/swig/releases/tag/cocos-v1.1.2 )
+    win64:      cocos-v1.1.2 (commit: 5c7c430)
+    mac:        cocos-v1.1.2 (commit: 5c7c430)
+    linux:      cocos-v1.1.2 (commit: 5c7c430)
--- a/win64/bin/swig/bin/swig.exe
+++ b/win64/bin/swig/bin/swig.exe
--- a/win64/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
+++ b/win64/bin/swig/share/swig/4.1.0/javascript/cocos/javascriptcode.swg
@ -278,6 +278,7 @@ SE_DECLARE_FINALIZE_FUNC(js_delete_$jsdtor) %}
 %{
 bool js_register_$jsmangledname(se::Object* obj) {
    $jsclass_inheritance
+    cls->defineStaticProperty("__isJSB", se::Value(true), se::PropertyAttribute::READ_ONLY | se::PropertyAttribute::DONT_ENUM | se::PropertyAttribute::DONT_DELETE);
    $jsclassvariables
    $jsclassfunctions
    $jsstaticclassvariables