Mark 32bit build deprecated, refer #1570

axmolengine · Jan 2, 2024 · ef7b985 · ef7b985
1 parent 9ca7760
commit ef7b985
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# axmol-2.1.0 ?? 2023
+# axmol-2.1.0 ?? 2024
 
 ### Significant changes relative to 2.0.0:
 
@@ -28,6 +28,7 @@
 - Add support for window resized and positioned by @lich426
 - Add extension: Inspector by @iAndyHD3
 - Add *experimental* WebSocket support for both wasm and native platforms
+- Mark 32bit build deprecated, and will be removed in next release axmol-2.2.0
 
 ### BugFixs
 

diff --git a/cmake/Modules/AXBuildSet.cmake b/cmake/Modules/AXBuildSet.cmake
@@ -64,3 +64,5 @@ message(STATUS "CMAKE_MODULE_PATH:" ${CMAKE_MODULE_PATH})
 message(STATUS "PROJECT_BINARY_DIR:" ${PROJECT_BINARY_DIR})
 message(STATUS "ENGINE_BINARY_PATH:" ${ENGINE_BINARY_PATH})
 message(STATUS "ARCH_ALIAS:" ${ARCH_ALIAS})
+
+ax_check_archs()
diff --git a/cmake/Modules/AXLinkHelpers.cmake b/cmake/Modules/AXLinkHelpers.cmake
@@ -1,5 +1,7 @@
 include(AXPlatform)
 
+ax_check_archs()
+
 if(NOT CMAKE_GENERATOR MATCHES "Ninja")
     set(BUILD_CONFIG_DIR "\$\(Configuration\)/")
 else()

diff --git a/cmake/Modules/AXPlatform.cmake b/cmake/Modules/AXPlatform.cmake
@@ -32,12 +32,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
     set(PLATFORM_NAME android)
     set(ARCH_ALIAS ${ANDROID_ABI})
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    if(ANDROID)
-        set(PLATFORM_NAME android)
-    else()
-        set(LINUX TRUE)
-        set(PLATFORM_NAME linux)
-    endif()
+    set(LINUX TRUE)
+    set(PLATFORM_NAME linux)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
      set(WASM TRUE)
      set(EMSCRIPTEN TRUE)
@@ -68,3 +64,9 @@ if(CMAKE_GENERATOR STREQUAL Xcode)
 elseif(CMAKE_GENERATOR MATCHES Visual)
     set(VS TRUE)
 endif()
+
+function(ax_check_archs)
+    if(("${ARCH_ALIAS}" MATCHES "x86") OR ("${ARCH_ALIAS}" MATCHES "armeabi-v7a"))
+        message(WARNING "Building 32-bit[${ARCH_ALIAS}] axmol is deprecated, and will be removed in next release axmol-2.2.0")
+    endif()
+endfunction()