Bump 1.1.0

1k/README.md

@@ -0,0 +1,3 @@
+# build1k
+
+The build1k -  A cross-pltaform one step build powershell script with auto setup general dependent tools, aka `1kbuild`, shorten name `1kb` or `1k`

cmake/Modules/AXGLSLCC.cmake

@@ -1,8 +1,3 @@
-if (__AXGLSLCC_CMAKE__)
-    return()
-endif()
-set(__AXGLSLCC_CMAKE__ TRUE)
-
 cmake_policy(PUSH)
 cmake_policy(SET CMP0057 NEW)
 

core/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright (c) 2013 cocos2d-x.org
 # Copyright (c) 2014 martell malone
 # Copyright (c) 2015-2017 Chukong Technologies Inc.
-# Copyright (c) 2021-2022 Bytedance Inc.
+# Copyright (c) 2021-2023 Bytedance Inc.
 # 
 # https://axmolengine.github.io/
 #
@@ -29,8 +29,10 @@
 # build ax
 # build axlua if AX_ENABLE_EXT_LUA=ON
 
+# include_guard (GLOBAL)
+
 # The version number
-set(_AX_VERSION 1.0)
+set(_AX_VERSION 1.1)
 
 if(NOT DEFINED _AX_CORE_LIB)
     set(_AX_CORE_LIB axmol CACHE INTERNAL "The axmol core lib name" )

core/axmolver.h.in

@@ -4,11 +4,11 @@
 // 0x00 HI ME LO
 // 00   03 08 00
 #define AX_VERSION_MAJOR 1
-#define AX_VERSION_MINOR 0
+#define AX_VERSION_MINOR 1
 #define AX_VERSION_PATCH 0
 
 /* Define the axmol version string, easy for script parsing */
-#define AX_VERSION_STR "1.0.0"
+#define AX_VERSION_STR "1.1.0"
 
 /* Define axmol version helper macros */
 #define AX_VERSION_MAKE(a,b,c) ((a << 16) | (b << 8) | (c & 0xff))

docs/DevSetup.md

@@ -128,15 +128,15 @@ See [windows workflow guide](https://github.com/axmolengine/axmol/issues/564)
    ```sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer```
   5. Generate the relevant xcode project using one of the following commands:
      - for ios arm64:  
-     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/cmake/ios.toolchain.cmake -DPLATFORM=OS64```
+     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/1k/ios.cmake -DPLATFORM=OS64```
      - for ios armv7,arm64 combined:  
-     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/cmake/ios.toolchain.cmake -DPLATFORM=OS```
+     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/1k/ios.cmake -DPLATFORM=OS```
      - for ios simulator x86_64:  
-     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/cmake/ios.toolchain.cmake -DPLATFORM=SIMULATOR64```
+     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/1k/ios.cmake -DPLATFORM=SIMULATOR64```
      - for tvos arm64:  
-     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/cmake/ios.toolchain.cmake -DPLATFORM=TVOS```
+     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/1k/ios.cmake -DPLATFORM=TVOS```
      - for tvos simulator x86_64:  
-     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/cmake/ios.toolchain.cmake -DPLATFORM=SIMULATOR_TVOS```
+     ```cmake -S . -B build -GXcode -DCMAKE_TOOLCHAIN_FILE=$AX_ROOT/1k/ios.cmake -DPLATFORM=SIMULATOR_TVOS```
      - for macos x86_64(Intel)
      ```cmake -S . -B build -GXcode -DCMAKE_OSX_ARCHITECTURES=x86_64```
      - for macos arm64(M1)

setup.ps1

@@ -1,7 +1,7 @@
 $myRoot = $PSScriptRoot
 $AX_ROOT = $myRoot
 
-$build1kPath = Join-Path $myRoot 'tools/ci/build1k.ps1'
+$build1kPath = Join-Path $myRoot '1k/build1k.ps1'
 $prefix = Join-Path $myRoot 'tools/external'
 if (!(Test-Path $prefix -PathType Container)) {
     mkdir $prefix | Out-Null