Prepare release v2.1.1

1k/platform.cmake

@@ -70,7 +70,7 @@ elseif(CMAKE_GENERATOR MATCHES Visual)
 endif()
 
 function(_1k_deprecated_32bit project_name release_ver)
-    if(("${ARCH_ALIAS}" MATCHES "x86") OR ("${ARCH_ALIAS}" MATCHES "armeabi-v7a"))
+    if(("${ARCH_ALIAS}" STREQUAL "x86") OR ("${ARCH_ALIAS}" MATCHES "armeabi-v7a"))
         message(WARNING "Building 32-bit[${ARCH_ALIAS}] ${project_name} is deprecated, and will be removed in next release ${release_ver}")
     endif()
 endfunction()

CHANGELOG.md

@@ -1,4 +1,4 @@
-## axmol-2.1.1 Feb.1 2024
+## axmol-2.1.1 Feb.2 2024
 
 ### BugFixes
 
@@ -9,6 +9,9 @@
 - Ensure scissor state is set to the correct value prior to a buffer clear by @rh101
 - Fix memory leaks when app exit on non-embed systems by @halx99 and @lich426
 - Fix can't generate lua bindings for set/get Node localZOrder, reporeted by @bintester
+- Fix lua template include incorrect module path, reported by @grif-on
+- Fix build win32 with clang error
+- Fix ci build-site download unexpected artifacts from appveyor
 
 ## Break changes
 
@@ -21,6 +24,14 @@
 ### 3rdparties updates
 
 - simdjson: 3.6.3 ==> 3.6.4
+- curl: 8.5.0 ==> 8.6.0
+- openssl: 3.0.12 ==> 3.0.13
+- yasio: 4.1.4 ==> 5.0.0
+- zlib: 1.3 ==> 1.3.1
+- jpeg-turbo: 3.0.1 ==> 3.0.2
+- libpng: 1.6.40 ==> 1.6.42
+- luajit: 2.1-43d0a19 ==> 2.1-9cc2e42
+
 
 ## axmol-2.1.0 Jan.20 2024
 

cmake/Modules/AXBuildHelpers.cmake

@@ -741,3 +741,20 @@ macro(ax_config_pred target_name pred)
         target_compile_definitions(${target_name} PUBLIC ${pred}=1)
     endif()
 endmacro()
+
+macro(source_group_by_dir proj_dir source_files)
+    if(MSVC OR APPLE)
+        get_filename_component(sgbd_cur_dir ${proj_dir} ABSOLUTE)
+        foreach(sgbd_file ${${source_files}})
+            get_filename_component(sgbd_abs_file ${sgbd_file} ABSOLUTE)
+            file(RELATIVE_PATH sgbd_fpath ${sgbd_cur_dir} ${sgbd_abs_file})
+            string(REGEX REPLACE "\(.*\)/.*" \\1 sgbd_group_name ${sgbd_fpath})
+            string(COMPARE EQUAL ${sgbd_fpath} ${sgbd_group_name} sgbd_nogroup)
+            string(REPLACE "/" "\\" sgbd_group_name ${sgbd_group_name})
+            if(sgbd_nogroup)
+                set(sgbd_group_name "\\")
+            endif(sgbd_nogroup)
+            source_group(${sgbd_group_name} FILES ${sgbd_file})
+        endforeach(sgbd_file)
+    endif(MSVC OR APPLE)
+endmacro(source_group_by_dir)

cmake/Modules/AXConfigDefine.cmake

@@ -225,3 +225,6 @@ if(NOT EXISTS "${CMAKE_ASM_NASM_COMPILER}")
    set(CMAKE_ASM_NASM_COMPILER_LOADED FALSE CACHE BOOL "Does cmake asm nasm compiler loaded" FORCE)
    message(WARNING "The nasm compiler doesn't present on your system PATH, please download from: https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/")
 endif()
+
+# we don't need cmake BUILD_TESTING feature
+set(BUILD_TESTING FALSE CACHE BOOL "" FORCE)

core/CMakeLists.txt

@@ -385,7 +385,6 @@ add_subdirectory(${_AX_ROOT}/extensions ${ENGINE_BINARY_PATH}/extensions)
 
 if(MSVC)
     target_sources(${_AX_CORE_LIB} PRIVATE ./axmol.natvis)
-    target_sources(${_AX_CORE_LIB} PRIVATE ../thirdparty/yasio/yasio.natvis)
     target_sources(${_AX_CORE_LIB} PRIVATE ../thirdparty/robin-map/tsl-robin-map.natvis)
     target_compile_options(${_AX_CORE_LIB} PUBLIC "/Zm2000")
 endif()

extensions/scripting/lua-bindings/CMakeLists.txt

@@ -182,8 +182,8 @@ set(lua_bindings_headers
 
 set(lua_bindings_files
     ${lua_bindings_files}
-    "${ax_root}/thirdparty/yasio/bindings/lyasio.cpp"
-    "${ax_root}/thirdparty/yasio/bindings/yasio_axlua.cpp")
+    "${ax_root}/thirdparty/yasio/yasio/bindings/lyasio.cpp"
+    "${ax_root}/thirdparty/yasio/yasio/bindings/yasio_axlua.cpp")
 
 list(APPEND lua_bindings_files ${lua_bindings_headers})
 

extensions/spine/runtime/include/spine/Debug.h

@@ -37,7 +37,7 @@
 
 namespace spine {
 
-	class SP_API DebugExtension : public SpineExtension {
+	class DebugExtension : public SpineExtension {
 		struct Allocation {
 			void *address;
 			size_t size;

manifest.json

@@ -1,6 +1,6 @@
 {
   "versions": {
-    "1kdist": "71",
+    "1kdist": "72",
     "oboe": "1.8.0",
     "kcp": "1.7-f2aa30e",
     "lz4": "1.9.4",

thirdparty/CMakeLists.txt

@@ -439,7 +439,6 @@ endif()
 
 if(AX_WITH_CARES)
     ax_add_3rd(c-ares)
-    target_compile_definitions(thirdparty INTERFACE YASIO_USE_CARES=1)
 endif()
 
 ax_add_3rd(llhttp)
@@ -466,7 +465,6 @@ endif()
 
 # kcp
 if(AX_WITH_KCP)
-    set(BUILD_TESTING OFF)
     _1kfetch(kcp)
     ax_add_3rd(${kcp_SOURCE_DIR} TARGETS kcp)
 endif()
@@ -479,6 +477,10 @@ if (WIN32)
     endif()
 endif()
 
+# yasio
+ax_add_3rd(yasio)
+
+# simdjson
 ax_add_3rd(simdjson)
 
 if (ANDROID)

thirdparty/README.md

@@ -52,7 +52,7 @@
 
 ## curl
 - [![Upstream](https://img.shields.io/github/v/release/curl/curl?label=Upstream)](https://github.com/curl/curl)
-- Version: 8.5.0
+- Version: 8.6.0
 - License: Curl (MIT/X)
 
 ## FastLZ
@@ -123,7 +123,7 @@
 
 - luajit
   - Upstream: https://github.com/LuaJIT/LuaJIT
-  - Version: 2.1-43d0a19
+  - Version: 2.1-9cc2e42
   - License: MIT
 
 - tolua
@@ -179,7 +179,7 @@
 
 ## OpenSSL
 - [![Upstream](https://img.shields.io/github/v/tag/openssl/openssl?label=Upstream)](https://github.com/openssl/openssl)
-- Version: 3.0.12
+- Version: 3.0.13
 - License: Apache-2.0
 
 ## png
@@ -253,11 +253,11 @@
 
 ## yasio
 - [![Upstream](https://img.shields.io/github/v/release/yasio/yasio?label=Upstream)](https://github.com/yasio/yasio)
-- Version: 4.1.4
+- Version: 5.0.0
 - License: MIT WITH Anti-996
 
 ## zlib
 - [![Upstream](https://img.shields.io/github/v/tag/madler/zlib?label=Upstream)](https://github.com/madler/zlib)
-- Version: 1.3
+- Version: 1.3.1
 - License: zlib
 

thirdparty/yasio/CMakeLists.txt

@@ -0,0 +1,41 @@
+
+set(lib_name yasio)
+set(target_name ${lib_name})
+
+project(${lib_name})
+
+FILE(GLOB_RECURSE YASIO_ALL_SOURCES "yasio/*.hpp")
+
+list(APPEND YASIO_ALL_SOURCES
+    "yasio/io_service.cpp"
+    "yasio/xxsocket.cpp"
+)
+
+if(CARES_INCLUDE_DIR AND ANDROID)
+    list(APPEND YASIO_ALL_SOURCES "yasio/platform/yasio_jni.cpp")
+endif()
+
+if(MSVC_IDE)
+    list(APPEND YASIO_ALL_SOURCES  "yasio/yasio.natvis")
+endif()
+
+source_group_by_dir("yasio" YASIO_ALL_SOURCES)
+
+add_library(${target_name} STATIC
+  ${YASIO_ALL_SOURCES}
+)
+
+target_include_directories(${target_name} PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+if(CARES_INCLUDE_DIR)
+    target_compile_definitions(${target_name} PUBLIC YASIO_USE_CARES=1)
+    target_include_directories(${target_name} PUBLIC ${CARES_INCLUDE_DIR})
+endif()
+
+target_include_directories(${target_name} PUBLIC ${OPENSSL_INCLUDE_DIR})
+target_compile_definitions(${target_name} PUBLIC YASIO_SSL_BACKEND=1)
+
+if (kcp_SOURCE_DIR)
+    target_compile_definitions(${target_name} PUBLIC YASIO_ENABLE_KCP=1)
+    target_include_directories(${target_name} PUBLIC ${kcp_SOURCE_DIR})
+endif()

thirdparty/yasio/io_service.hpp → thirdparty/yasio/yasio/io_service.hpp

@@ -55,7 +55,7 @@ SOFTWARE.
 #endif
 
 #if defined(YASIO_ENABLE_KCP)
-#  include "kcp/ikcp.h"
+#  include "ikcp.h"
 struct yasio_kcp_options;
 #endif