Working in-progress v3

.github/workflows/build.yml

@@ -28,7 +28,7 @@ on:
 env:
   __1K_CXXSTD: '${{ inputs.cxxstd }}'
 
-run-name: 'build@c++${{ inputs.cxxstd || 20 }}'
+run-name: 'build@c++${{ inputs.cxxstd || 23 }}'
 
 jobs:
   win32:
@@ -180,3 +180,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'

.gitignore

@@ -51,8 +51,8 @@ gen/
 assets/
 local.properties
 
-/core/axmolver.h
-/core/renderer/RenderConsts.h
+/axmol/axmolver.h
+/axmol/renderer/RenderConsts.h
 
 # Ignore python compiled files
 *.pyc

1k/1kiss.ps1

@@ -772,7 +772,7 @@ function download_and_expand($url, $out, $dest) {
         $1k.mkdirs($dest)
         if ($out.EndsWith('.zip')) {
             if ($IsWin) {
-                Expand-Archive -Path $out -DestinationPath $dest
+                Expand-Archive -Path $out -DestinationPath $dest -Force
             }
             else {
                 unzip -d $dest $out | Out-Null
@@ -995,6 +995,11 @@ function setup_axslcc() {
         return $axslcc_prog
     }
 
+    $axslcc_prog = (Join-Path $axslcc_bin "axslcc$EXE_SUFFIX")
+    if($1k.isfile($axslcc_prog)) {
+        $1k.del($axslcc_prog)
+    }
+
     $suffix = @('win64.zip', 'linux.tar.gz', 'osx{0}.tar.gz')[$HOST_OS_INT]
     if ($IsMacOS) {
         if ([System.VersionEx]$axslcc_ver -ge [System.VersionEx]'1.9.4.1') {
@@ -1008,7 +1013,6 @@ function setup_axslcc() {
     $glscc_base_url = $mirror_current.axslcc
     fetch_pkg "$mirror_url_base$glscc_base_url/v$axslcc_ver/axslcc-$axslcc_ver-$suffix" -exrep "axslcc"
 
-    $axslcc_prog = (Join-Path $axslcc_bin "axslcc$EXE_SUFFIX")
     if ($1k.isfile($axslcc_prog)) {
         $1k.println("Using axslcc: $axslcc_prog, version: $axslcc_ver")
     } else {
@@ -1211,7 +1215,7 @@ function setup_unzip() {
     $unzip_cmd_info = Get-Command 'unzip' -ErrorAction SilentlyContinue
     if (!$unzip_cmd_info) {
         if ($IsLinux) {
-            if ($(which dpkg)) { 
+            if ($(which dpkg)) {
                 sudo apt install unzip
             }
             elseif($(which pacman)) {
@@ -1323,7 +1327,7 @@ function setup_android_sdk() {
             return $null
         }
         $1k.println("Looking require $ndk_ver$IsGraterThan in $sdk_dir")
-        
+
         $ndk_major = ($ndk_ver -replace '[^0-9]', '')
         $ndk_minor_off = "$ndk_major".Length + 1
         $ndk_minor = if ($ndk_minor_off -lt $ndk_ver.Length) { "$([int][char]$ndk_ver.Substring($ndk_minor_off) - $ndk_minor_base)" } else { '0' }
@@ -1367,7 +1371,7 @@ function setup_android_sdk() {
     }
 
     $ndk_root = &$find_ndk_in $selected_sdk_root
-    
+
     $sdk_comps = @()
 
     ### cmdline-tools ###

1k/build.profiles

@@ -5,8 +5,10 @@
 
 # --- region platfom:common
 
-# The axmol shader compiler, legacy name is 'glslcc' before axmol-2.3.0
-axslcc=1.9.6+
+# The axmol shader compiler,
+# before axmol-2.3.0, it's 'glslcc'
+# before axmol-3.0.0, it's 'axslcc'
+axslcc=1.11.0+
 
 # The cmake, @gradle @axmol-cmdline
 # as latest as possible
@@ -27,7 +29,7 @@ nuget=5.5.1.*
 vs=17.0+
 
 # as stable and latest as possible, @axmol-cmdline @genbindings.ps1
-llvm=19.0.0~19.1.7+
+llvm=20.1.8+
 
 # --- endregion
 
@@ -46,15 +48,15 @@ cmdlinetools=19.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=r27d
 
 # The android target sdk version, @gradle
 # as latest as possible
 target_sdk=36
 
 # 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")

1k/manifest.ps1

@@ -25,7 +25,7 @@ $manifest['cmdlinetools'] = $build_profiles['cmdlinetools']
 $Global:build_profiles = $build_profiles
 
 $Global:download_path = $1k.realpath("$PSScriptRoot/../cache")
-	
+
 # add or overwrite tool version like follow
 if ($Global:is_axmol_app -or $Global:is_axmol_engine) {
     $manifest['axslcc'] = $build_profiles['axslcc']

3rdparty/CMakeLists.txt

@@ -162,22 +162,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"
@@ -301,11 +285,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.1
 - 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.4
@@ -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.2
+- 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,7 +86,7 @@
 - Version: 3.4 with modified for create as win32 child window support
 - License: zlib
 
-## GHC (iOS devices only)
+## ghc (iOS < 13 ONLY)
 - [![Upstream](https://img.shields.io/github/v/release/gulrak/filesystem?label=Upstream)](https://github.com/gulrak/filesystem)
 - Version: 1.5.14
 - License: MIT
@@ -180,7 +180,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 +229,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.13.0
 - License: Apache-2.0
 
 ## stb (stb_image)

3rdparty/box2d/CMakeLists.txt

@@ -4,105 +4,31 @@ 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"