From acc47b32814c1fd02098261d04340e7c90c684ab Mon Sep 17 00:00:00 2001 From: halx99 Date: Thu, 6 Jul 2023 20:24:41 +0800 Subject: [PATCH] Bump 1.1.0 --- 1k/README.md | 3 +++ {tools/ci => 1k}/build1k.ps1 | 0 {tools/ci => 1k}/ios.cmake | 0 cmake/Modules/AXBuildHelpers.cmake | 2 +- cmake/Modules/AXGLSLCC.cmake | 5 ----- core/CMakeLists.txt | 6 ++++-- core/axmolver.h.in | 4 ++-- docs/DevSetup.md | 10 +++++----- setup.ps1 | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 1k/README.md rename {tools/ci => 1k}/build1k.ps1 (100%) rename {tools/ci => 1k}/ios.cmake (100%) diff --git a/1k/README.md b/1k/README.md new file mode 100644 index 0000000000..1a107390b6 --- /dev/null +++ b/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` diff --git a/tools/ci/build1k.ps1 b/1k/build1k.ps1 similarity index 100% rename from tools/ci/build1k.ps1 rename to 1k/build1k.ps1 diff --git a/tools/ci/ios.cmake b/1k/ios.cmake similarity index 100% rename from tools/ci/ios.cmake rename to 1k/ios.cmake diff --git a/cmake/Modules/AXBuildHelpers.cmake b/cmake/Modules/AXBuildHelpers.cmake index c1f30ba77a..7e7323b4dd 100644 --- a/cmake/Modules/AXBuildHelpers.cmake +++ b/cmake/Modules/AXBuildHelpers.cmake @@ -591,4 +591,4 @@ endmacro() # import minimal AXGLSLCC.cmake for shader compiler support # the function: ax_target_compile_shaders avaiable from it -include (AXGLSLCC) +include(AXGLSLCC) diff --git a/cmake/Modules/AXGLSLCC.cmake b/cmake/Modules/AXGLSLCC.cmake index cc5e55cd40..c627b9f040 100644 --- a/cmake/Modules/AXGLSLCC.cmake +++ b/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) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 04118f8d6d..6709a3da41 100644 --- a/core/CMakeLists.txt +++ b/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" ) diff --git a/core/axmolver.h.in b/core/axmolver.h.in index 58e742e2d6..2b72da0bd9 100644 --- a/core/axmolver.h.in +++ b/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)) diff --git a/docs/DevSetup.md b/docs/DevSetup.md index f0499b66c3..ef9f112075 100644 --- a/docs/DevSetup.md +++ b/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) diff --git a/setup.ps1 b/setup.ps1 index da2b0d3569..100df00dcc 100644 --- a/setup.ps1 +++ b/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