Merge pull request #414 from dumganhar/v3.8.1-hmi

v3.8.1-hmi merges v3.8.0-hmi branch

android/CMakeLists.txt

@@ -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()
 
 

emscripten/box2d/b2.d.ts

@@ -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;
 }

mac/CMakeLists.txt

@@ -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}

sources/CMakeLists.txt

@@ -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