Working in-progress v3

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ on:
 env:
   __1K_CXXSTD: '${{ inputs.cxxstd }}'
 
-run-name: 'ci@c++${{ inputs.cxxstd || 20 }}'
+run-name: 'ci@c++${{ inputs.cxxstd || 23 }}'
 
 jobs:
   win32:
@@ -172,3 +172,12 @@ jobs:
         token: ${{ secrets.AX_TRIGGER_SITE_TOKEN }}
         repository: axmolengine/axmol.dev
         event-type: forward-push
+  wasm64:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+    - name: Build
+      shell: pwsh
+      run: ./tools/cmdline/axmol -p wasm64 -xc '-DAX_ENABLE_EXT_EFFEKSEER=ON,-DAX_WASM_THREADS=8' -j2 -t 'cpp-tests,fairygui-tests,lua-tests'

1k/build.profiles

@@ -46,15 +46,15 @@ cmdlinetools=12.0
 # - https://developer.android.google.cn/about/versions/15/behavior-changes-all?hl=zh-cn#16-kb
 # In China Mainland, please download from https://pan.baidu.com/s/1neJydxOGTT7aCQvLLwbicw?pwd=qqiq
 # to $AX_ROOT/cache/, then run `setup.ps1 -p android`
-ndk=r23d
+ndk=r27c
 
 # The android target sdk version, @gradle
 # as latest as possible
 target_sdk=35
 
 # The android min sdk version, @gradle
 # as min as possible
-min_sdk=17
+min_sdk=21
 
 # The gradle version, @setup.ps1
 # as latest as possible

1k/ios.cmake

@@ -35,7 +35,7 @@ if(NOT DEFINED DEPLOYMENT_TARGET)
            if (XCODE_VERSION LESS "14.3.0")
                set(DEPLOYMENT_TARGET "11.0" CACHE STRING "" FORCE)
            else() # xcode 14.3+ require 12.0 for c++ std::get
-               set(DEPLOYMENT_TARGET "12.0" CACHE STRING "" FORCE)
+               set(DEPLOYMENT_TARGET "13.0" CACHE STRING "" FORCE)
            endif()
         endif()
     elseif (PLAT STREQUAL "tvOS")

3rdparty/CMakeLists.txt

@@ -156,22 +156,6 @@ if(AX_ENABLE_PHYSICS)
     ax_add_3rd(box2d OPTIONS ${box2d_opts})
 endif()
 
-if(AX_ENABLE_PHYSICS)
-    ax_add_3rd(chipmunk OPTIONS
-        "CP_BUILD_SHARED OFF"
-        "CP_BUILD_STATIC ON"
-        "CP_BUILD_DEMOS OFF"
-        "CP_INSTALL_STATIC OFF"
-    )
-    set_target_properties(chipmunk PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/chipmunk/include"
-    )
-
-    # !important axmol not use double precision
-    target_compile_definitions(chipmunk PUBLIC CP_USE_CGTYPES=0)
-    target_compile_definitions(chipmunk PUBLIC CP_USE_DOUBLES=0)
-endif()
-
 ax_add_3rd(freetype OPTIONS
     "DISABLE_FORCE_DEBUG_POSTFIX ON"
     "SKIP_INSTALL_ALL TRUE"
@@ -288,11 +272,11 @@ if (AX_ENABLE_AUDIO)
             set(ALSOFT_CPPWINRT_VERSION ${AX_CPPWINRT_VERSION} CACHE STRING "" FORCE)
         endif()
 
-        ax_add_3rd(openal EXCLUDE_FROM_ALL TARGETS alcommon;OpenAL OPTIONS ${alsoft_opts})
+        ax_add_3rd(openal EXCLUDE_FROM_ALL TARGETS OpenAL;alsoft.common OPTIONS ${alsoft_opts})
 
         target_include_directories(3rdparty INTERFACE openal)
         target_compile_definitions(3rdparty INTERFACE AX_USE_ALSOFT=1)
-        set_target_properties(OpenAL alcommon PROPERTIES CXX_STANDARD ${_AX_CXX_STD})
+        set_target_properties(OpenAL alsoft.common PROPERTIES CXX_STANDARD ${_AX_CXX_STD})
 
         if (AX_USE_ALSOFT_STATIC)
             target_compile_definitions(3rdparty INTERFACE AL_LIBTYPE_STATIC=1)

3rdparty/README.md

@@ -11,7 +11,7 @@
 
 ## Box2D
 - [![Upstream](https://img.shields.io/github/v/release/erincatto/box2d?label=Upstream)](https://github.com/erincatto/box2d)
-- Version: 2.4.2
+- Version: 3.1.0
 - License: MIT
 
 ## Bullet
@@ -25,11 +25,6 @@
 - Version: 1.34.5
 - License: MIT
 
-## Chipmunk2D
-- [![Upstream](https://img.shields.io/github/v/tag/slembcke/Chipmunk2D?label=Upstream)](https://github.com/slembcke/Chipmunk2D)
-- Version: git 7.0.3-0cb05e7 {until Dec 16, 2021}
-- License: MIT
-
 ## Clipper2
 - [![Upstream](https://img.shields.io/github/v/tag/AngusJohnson/Clipper2?label=Upstream)](https://github.com/AngusJohnson/Clipper2)
 - Version: 1.5.2
@@ -60,6 +55,11 @@
 - Version: git 344eb40 (121)
 - License: MIT
 
+## fast_float
+- [![Upstream](https://img.shields.io/github/v/release/fastfloat/fast_float?label=Upstream)](https://github.com/fastfloat/fast_float)
+- Version: 8.0.0
+- License: MIT
+
 ## flatbuffers
 - [![Upstream](https://img.shields.io/github/v/release/google/flatbuffers?label=Upstream)](https://github.com/google/flatbuffers)
 - Version: 25.2.10
@@ -86,11 +86,6 @@
 - Version: 3.4 with modified for create as win32 child window support
 - License: zlib
 
-## GHC (iOS devices only)
-- [![Upstream](https://img.shields.io/github/v/release/gulrak/filesystem?label=Upstream)](https://github.com/gulrak/filesystem)
-- Version: 1.5.14
-- License: MIT
-
 ## jni.hpp
 - [![Upstream](https://img.shields.io/github/v/release/mapbox/jni.hpp?label=Upstream)](https://github.com/mapbox/jni.hpp)
 - Version: v4.0.0
@@ -180,7 +175,11 @@
 
 ## OpenAL Soft
 - [![Upstream](https://img.shields.io/github/v/tag/kcat/openal-soft?label=Upstream)](https://github.com/kcat/openal-soft)
-- Version: 1.23.1-e714c8f (8659)
+- Version: 1.24.3
+- Modifications: 
+  - Remove `-Werror=undef`
+  - Linking `fmt::fmt` instead `alsoft::fmt`
+  - Exclude target `alsoft::excommon`
 - License: LGPL-2.1
 
 ## OpenSSL
@@ -225,7 +224,7 @@
 
 ## simdjson
 - [![Upstream](https://img.shields.io/github/v/tag/simdjson/simdjson?label=Upstream)](https://github.com/simdjson/simdjson)
-- Version: 3.10.1
+- Version: 3.12.0
 - License: Apache-2.0
 
 ## stb (stb_image)

3rdparty/box2d/CMakeLists.txt

@@ -4,105 +4,30 @@ set(target_name ${lib_name})
 
 project(${lib_name})
 
-set(BOX2D_SOURCE_FILES
-	src/collision/b2_broad_phase.cpp
-	src/collision/b2_chain_shape.cpp
-	src/collision/b2_circle_shape.cpp
-	src/collision/b2_collide_circle.cpp
-	src/collision/b2_collide_edge.cpp
-	src/collision/b2_collide_polygon.cpp
-	src/collision/b2_collision.cpp
-	src/collision/b2_distance.cpp
-	src/collision/b2_dynamic_tree.cpp
-	src/collision/b2_edge_shape.cpp
-	src/collision/b2_polygon_shape.cpp
-	src/collision/b2_time_of_impact.cpp
-	src/common/b2_block_allocator.cpp
-	src/common/b2_draw.cpp
-	src/common/b2_math.cpp
-	src/common/b2_settings.cpp
-	src/common/b2_stack_allocator.cpp
-	src/common/b2_timer.cpp
-	src/dynamics/b2_body.cpp
-	src/dynamics/b2_chain_circle_contact.cpp
-	src/dynamics/b2_chain_circle_contact.h
-	src/dynamics/b2_chain_polygon_contact.cpp
-	src/dynamics/b2_chain_polygon_contact.h
-	src/dynamics/b2_circle_contact.cpp
-	src/dynamics/b2_circle_contact.h
-	src/dynamics/b2_contact.cpp
-	src/dynamics/b2_contact_manager.cpp
-	src/dynamics/b2_contact_solver.cpp
-	src/dynamics/b2_contact_solver.h
-	src/dynamics/b2_distance_joint.cpp
-	src/dynamics/b2_edge_circle_contact.cpp
-	src/dynamics/b2_edge_circle_contact.h
-	src/dynamics/b2_edge_polygon_contact.cpp
-	src/dynamics/b2_edge_polygon_contact.h
-	src/dynamics/b2_fixture.cpp
-	src/dynamics/b2_friction_joint.cpp
-	src/dynamics/b2_gear_joint.cpp
-	src/dynamics/b2_island.cpp
-	src/dynamics/b2_island.h
-	src/dynamics/b2_joint.cpp
-	src/dynamics/b2_motor_joint.cpp
-	src/dynamics/b2_mouse_joint.cpp
-	src/dynamics/b2_polygon_circle_contact.cpp
-	src/dynamics/b2_polygon_circle_contact.h
-	src/dynamics/b2_polygon_contact.cpp
-	src/dynamics/b2_polygon_contact.h
-	src/dynamics/b2_prismatic_joint.cpp
-	src/dynamics/b2_pulley_joint.cpp
-	src/dynamics/b2_revolute_joint.cpp
-	src/dynamics/b2_weld_joint.cpp
-	src/dynamics/b2_wheel_joint.cpp
-	src/dynamics/b2_world.cpp
-	src/dynamics/b2_world_callbacks.cpp
-	src/rope/b2_rope.cpp)
+file(GLOB_RECURSE box2d_sources *.h;*.c)
 
-set(BOX2D_HEADER_FILES
-	include/box2d/b2_api.h
-	include/box2d/b2_block_allocator.h
-	include/box2d/b2_body.h
-	include/box2d/b2_broad_phase.h
-	include/box2d/b2_chain_shape.h
-	include/box2d/b2_circle_shape.h
-	include/box2d/b2_collision.h
-	include/box2d/b2_common.h
-	include/box2d/b2_contact.h
-	include/box2d/b2_contact_manager.h
-	include/box2d/b2_distance.h
-	include/box2d/b2_distance_joint.h
-	include/box2d/b2_draw.h
-	include/box2d/b2_dynamic_tree.h
-	include/box2d/b2_edge_shape.h
-	include/box2d/b2_fixture.h
-	include/box2d/b2_friction_joint.h
-	include/box2d/b2_gear_joint.h
-	include/box2d/b2_growable_stack.h
-	include/box2d/b2_joint.h
-	include/box2d/b2_math.h
-	include/box2d/b2_motor_joint.h
-	include/box2d/b2_mouse_joint.h
-	include/box2d/b2_polygon_shape.h
-	include/box2d/b2_prismatic_joint.h
-	include/box2d/b2_pulley_joint.h
-	include/box2d/b2_revolute_joint.h
-	include/box2d/b2_rope.h
-	include/box2d/b2_settings.h
-	include/box2d/b2_shape.h
-	include/box2d/b2_stack_allocator.h
-	include/box2d/b2_time_of_impact.h
-	include/box2d/b2_timer.h
-	include/box2d/b2_time_step.h
-	include/box2d/b2_types.h
-	include/box2d/b2_weld_joint.h
-	include/box2d/b2_wheel_joint.h
-	include/box2d/b2_world.h
-	include/box2d/b2_world_callbacks.h
-	include/box2d/box2d.h)
+add_library(${target_name} ${box2d_sources})
 
-add_library(${target_name} STATIC ${BOX2D_SOURCE_FILES} ${BOX2D_HEADER_FILES})
+if (MSVC)
+    if (BUILD_SHARED_LIBS)
+		# this is needed by DLL users to import Box2D symbols
+		target_compile_definitions(box2d INTERFACE BOX2D_DLL)
+	endif()
+endif()
+
+# Atomics are still considered experimental in Visual Studio 17.8
+if (FULL_MSVC)
+    target_compile_options(box2d PRIVATE /experimental:c11atomics)
+endif()
+
+set_target_properties(${target_name} PROPERTIES C_STANDARD 17 C_STANDARD_REQUIRED TRUE)
+
+if(_simdc_defines)
+    target_compile_definitions(${target_name} PRIVATE ${_simdc_defines})
+    if(_simdc_options)
+        target_compile_options(${target_name} PRIVATE ${_simdc_options})
+    endif()
+endif()
 
 target_include_directories(${target_name} 
     PUBLIC  "${CMAKE_CURRENT_SOURCE_DIR}/include"