Merge pull request #437 from cocos/v3.8.1

V3.8.1
Revert "V3.8.1 (#435 )" (#436 )
2023-10-10 15:17:30 +08:00 · 2023-10-10 15:16:30 +08:00 · 2023-10-10 14:02:28 +08:00 · 2023-09-01 11:44:04 +08:00 · 2023-09-01 11:22:43 +08:00 · 2023-09-01 10:29:02 +08:00
16 changed files with 8180 additions and 7873 deletions
@@ -84,7 +84,8 @@ if(USE_SE_V8)
      IMPORTED_LOCATION ${platform_spec_path}/v8/libinspector.a
      INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/v8
    )
-    set(se_libs_name v8_monolith v8_inspector)
+    set(se_libs_name v8_monolith)
+    set(se_libs_include ${platform_spec_path}/include/v8)
 endif()

 if(USE_WEBSOCKET_SERVER)
@@ -160,7 +161,9 @@ endif()

 set(ZLIB z)
 if(NOT USE_MODULES)
-  list(APPEND CC_EXTERNAL_LIBS ${ZLIB}  ${se_libs_name})
+  list(APPEND CC_EXTERNAL_LIBS ${ZLIB} 
+   ${se_libs_name}
+   )
 endif()


@@ -185,6 +185,7 @@ declare namespace B2 {
        GetFilterData(): Filter;
        Refilter(): void;
        GetBody(): Body;
+        GetNext(): Fixture;
        TestPoint(p: Vec2): boolean;
        RayCast(output: RayCastOutput, input: RayCastInput, childIndex: number): boolean;
        GetMassData(massData: MassData): void;
@@ -272,6 +273,8 @@ declare namespace B2 {
        IsEnabled(): boolean;
        SetFixedRotation(flag: boolean): void;
        IsFixedRotation(): boolean;
+        GetFixtureList(): Fixture;
+        GetJointList(): number;
        GetWorld(): World;
        Dump(): void;
    }
@@ -572,4 +575,10 @@ declare namespace B2 {
    function ContactImpulseGetNormalImpulse(contactImpulsePtr: number, index: number): number;
    function ContactImpulseGetTangentImpulse(contactImpulsePtr: number, index: number): number;
    function ContactImpulseGetCount(contactImpulsePtr: number): number;
+
+    //JointEdge
+    function JointEdgeGetOther(jointEdgePtr: number): number;
+    function JointEdgeGetJoint(jointEdgePtr: number): number;
+    function JointEdgeGetPrev(jointEdgePtr: number): number;
+    function JointEdgeGetNext(jointEdgePtr: number): number;
 }
@@ -83,7 +83,7 @@ set_target_properties(GLESv2 PROPERTIES

 add_library(SDL2 SHARED IMPORTED GLOBAL)
 set_target_properties(SDL2 PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libSDL2-2.0.0.dylib
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libSDL2.a
 )

 set(se_libs_name)
@@ -211,6 +211,9 @@ list(APPEND CC_EXTERNAL_LIBS
    webp
    curl
    SDL2
+    # sdl2 depends on the following two libraries.
+    "-framework IOKit"
+    "-framework Carbon"
    ${glslang_libs_name}
    ${spirv-cross_libs_name}
    ${tbb_libs_name}
@@ -61,7 +61,7 @@ add_definitions(-DCC_SWAPPY_ENABLED)
 endif()


-if(ANDROID)
+if(ANDROID AND (NOT SURFACE_LESS_SERVICE))
    set(CC_GAME_ACTIVITY_SOURCES
        ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/GameActivity.cpp
        ${CMAKE_CURRENT_LIST_DIR}/android-gamesdk/GameActivity/game-activity/include/game-activity/system_utils.cpp
Author	SHA1	Message	Date
minggoandGitHub	9eae68bdbf	Merge pull request #437 from cocos/v3.8.1 V3.8.1	2023-10-10 15:17:30 +08:00
minggoandGitHub	d2d1fb09aa	Revert "V3.8.1 (#435 )" (#436 ) This reverts commit `c481216bf5`.	2023-10-10 15:16:30 +08:00
minggo GitHub Canvas Ling Zhan	c481216bf5	V3.8.1 (#435 ) * update spine wasm & asm, fix event data bind. (#410) * update spine wasm & asm, fix event data bind. * update spine wasm & asm to fix event data. * update spine wasm & asm api. * update spine wasm & asm to fix const string. * update bullet wasm: [fix] cct scaling causes trigger event missing (#416) --------- Co-authored-by: Canvas <Canvasfull@gmail.com> Co-authored-by: Ling Zhan <lealzhan@126.com>	2023-10-10 14:02:28 +08:00
Ling ZhanandGitHub	e0776e986f	update bullet wasm: [fix] cct scaling causes trigger event missing (#416 )	2023-09-01 11:44:04 +08:00
CanvasandGitHub	c634ab5511	update spine wasm & asm, fix event data bind. (#410 ) * update spine wasm & asm, fix event data bind. * update spine wasm & asm to fix event data. * update spine wasm & asm api. * update spine wasm & asm to fix const string.	2023-09-01 11:22:43 +08:00
minggoandGitHub	2fe0317e84	Merge pull request #414 from dumganhar/v3.8.1-hmi v3.8.1-hmi merges v3.8.0-hmi branch	2023-09-01 10:29:02 +08:00
James Chen	43a8b88764	Merge branch 'v3.8.0-hmi' into v3.8.1-hmi	2023-09-01 10:26:08 +08:00
Ling ZhanandGitHub	e1afa91277	update box2dwasm (#413 )	2023-08-31 14:19:19 +08:00
qiuguohuaandGitHub	24253d9b2e	SDL use static libraries (#409 )	2023-08-25 15:18:31 +08:00
CanvasandGitHub	795d74c84b	fix douyin asm load error. (#407 )	2023-08-23 21:08:28 +08:00
minggoandGitHub	8fef1505b4	Merge pull request #383 from dumganhar/v3.8.0-hmi v3.8.0-hmi merges v3.8.0	2023-07-11 17:43:38 +08:00
James Chen	772894d6a0	Merge branch 'v3.8.0' of github.com:cocos/cocos-engine-external into v3.8.0-hmi	2023-07-11 17:39:43 +08:00
minggoandGitHub	d30c066419	Merge pull request #357 from dumganhar/v3.8.0-hmi v3.8.0-hmi branch merges v3.7.2-hmi	2023-06-05 16:41:52 +08:00
James Chen	ab15deb121	Merge branch 'v3.8.0' of github.com:cocos/cocos-engine-external into v3.7.2-hmi	2023-06-05 13:51:02 +08:00
江战andGitHub	0fd7ff8de9	Merge pull request #344 from PatriceJiang/v3.7.2-hmi support dynamic library loading	2023-04-24 14:34:43 +08:00
Patrice Jiang	651482be4f	support dynamic library loading	2023-04-20 16:24:56 +08:00
James ChenandGitHub	b701539f22	Update sources/CMakeLists.txt, add configuration for surfaceless mode (#341 )	2023-04-17 16:06:37 +08:00