Prepare 2.1.0 release

* Update copyright notice
* Remove prebuilt libs from SCM
* Remove optional thirdparty sources/repo from SCM
* Remove tests resources  folder 'Content' from SCM
This commit is contained in:
halx99 2023-12-08 00:13:39 +08:00
parent 2ab2bba3e4
commit affcf05b69
2461 changed files with 1133009 additions and 486 deletions

View File

@ -1,49 +0,0 @@
name: site
# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches:
- dev
paths:
- core/**/*
- docs/**/*
- .github/workflows/site.yml
- tools/ci/build-site.ps1
workflow_dispatch:
jobs:
build-site:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Build HTML site
shell: pwsh
run: |
$env:AX_DOCS_TOKEN = '${{ secrets.AX_BOT_TOKEN }}'
./tools/ci/build-site.ps1
# Deploy HTML site to GitHub Pages
- name: GH Pages Deployment
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/dist/
enable_jekyll: false
allow_empty_commit: false
force_orphan: true
publish_branch: gh-pages
# Deploy HTML site to netlify Pages
- name: Netlify Pages Deployment
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/dist2/
enable_jekyll: false
allow_empty_commit: false
force_orphan: true
publish_branch: netlify-pages

5
.gitignore vendored
View File

@ -110,7 +110,7 @@ CMakeSettings.json
# ignore all build
/build
/build*
/build_*
# ignore ninja build dir
/out
@ -220,3 +220,6 @@ tools/bindings-generator/libclang/*.so
templates/lua-template-default/Content/src/axmol
tests/lua-tests/Content/src/axmol
tests/lua-tests/Content/res
tests/cpp-tests/Content
tests/fairygui-tests/Content
tests/live2d-tests/Content

View File

@ -1,3 +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`
The build1k - A cross-pltaform one step build powershell script with auto setup general dependent tools, aka `1kbuild`, shorten name `1k`

View File

@ -26,7 +26,7 @@
# SOFTWARE.
#
#
# The build1k.ps1, will be core script of project https://github.com/axmolengine/build1k
# The 1k/build.ps1, will be core script of project https://github.com/axmolengine/1k
# options
# -p: build target platform: win32,winuwp,linux,android,osx,ios,tvos,watchos,wasm
# for android: will search ndk in sdk_root which is specified by env:ANDROID_HOME first,
@ -188,7 +188,7 @@ $manifest = @{
cmake = '3.27.7+';
ninja = '1.11.1+';
jdk = '17.0.3+';
emsdk = '3.1.47';
emsdk = '3.1.50';
cmdlinetools = '7.0+'; # android cmdlinetools
}

66
1k/fetch.cmake Normal file
View File

@ -0,0 +1,66 @@
#
# the 1k fetch functions
# require predefine variable:
# _1kfetch_cache_dir
# _1kfetch_manifest
#
### 1kdist url
file(READ "${_1kfetch_manifest}" _manifest_content)
string(JSON _1kdist_ver GET "${_manifest_content}" 1kdist)
set(_1kdist_ver v${_1kdist_ver})
set(_1kdist_base_url "https://github.com/axmolengine/1k/releases/download/${_1kdist_ver}" CACHE STRING "" FORCE)
# fetch prebuilt from 1kdist
# param package_name
function(_1kfetch_dist package_name)
set(_prebuilt_root ${CMAKE_CURRENT_LIST_DIR}/_d)
if(NOT IS_DIRECTORY ${_prebuilt_root})
set (package_url "${_1kdist_base_url}/${package_name}.zip")
set (package_store "${_1kfetch_cache_dir}/${package_name}.${_1kdist_ver}.zip")
message(AUTHOR_WARNING "Downloading ${package_url}")
if (NOT EXISTS ${package_store})
file(DOWNLOAD ${package_url} ${package_store} STATUS _status LOG _logs SHOW_PROGRESS)
list(GET _status 0 status_code)
list(GET _status 1 status_string)
if(NOT status_code EQUAL 0)
message(FATAL_ERROR "Download ${package_url} fail, ${status_string}, logs: ${_logs}")
endif()
endif()
file(ARCHIVE_EXTRACT INPUT ${package_store} DESTINATION ${CMAKE_CURRENT_LIST_DIR}/)
file(RENAME ${CMAKE_CURRENT_LIST_DIR}/${package_name} ${_prebuilt_root})
endif()
# set platform specific path, PLATFORM_NAME provided by user: win32,winrt,mac,ios,android,tvos,watchos,linux
set(_prebuilt_lib_dir "${_prebuilt_root}/lib/${PLATFORM_NAME}")
if(ANDROID OR WIN32)
set(_prebuilt_lib_dir "${_prebuilt_lib_dir}/${ARCH_ALIAS}")
endif()
set(${package_name}_INC_DIR ${_prebuilt_root}/include PARENT_SCOPE)
set(${package_name}_LIB_DIR ${_prebuilt_lib_dir} PARENT_SCOPE)
endfunction()
# params: name, url
function(_1kfetch name url)
if(NOT url)
message(FATAL_ERROR "Missing url for package ${name}")
endif()
set(_pkg_store "${_1kfetch_cache_dir}/${name}")
find_program(PWSH_COMMAND NAMES pwsh powershell NO_PACKAGE_ROOT_PATH NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED)
execute_process(COMMAND ${PWSH_COMMAND} ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/fetch.ps1
-url "${url}"
-name "${name}"
-dest "${_pkg_store}"
-cfg ${_1kfetch_manifest})
set(${name}_SOURCE_DIR ${_pkg_store} PARENT_SCOPE)
endfunction()
function(_1klink source dest)
if(UNIX)
execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "${source}" "${dest}")
else()
file(TO_NATIVE_PATH "${dest}" _dstDir)
file(TO_NATIVE_PATH "${source}" _srcDir)
execute_process(COMMAND cmd.exe /c mklink /J "${_dstDir}" "${_srcDir}")
endif()
endfunction()

37
1k/fetch.ps1 Normal file
View File

@ -0,0 +1,37 @@
param(
$url,
$name,
$dest,
$cfg
)
if (!$url -or !$name -or !$dest) {
throw 'fetch.ps1: missing parameters'
}
$version_map = ConvertFrom-Json (Get-Content $cfg -raw)
$pkg_ver = $version_map.PSObject.Properties[$name].Value
if ($pkg_ver) {
if (Test-Path $dest -PathType Container) {
if (!(Test-Path $(Join-Path $dest '.git') -PathType Container)) {
Remove-Item $dest -Recurse -Force
git clone $url $dest
}
}
else {
git clone $url $dest
}
$pkg_ver = $pkg_ver.Split('-')
$use_hash = $pkg_ver.Count -gt 1
$revision = $pkg_ver[$use_hash].Trim()
$tag_info = git -C $dest tag | Select-String $revision
if ($tag_info) {
git -C $dest checkout ([array]$tag_info.Line)[0] 1>$null 2>$null
}
else {
git -C $dest checkout $revision 1>$null 2>$null
}
} else {
throw "fetch.ps1: not found version for package ${name}"
}

View File

@ -1,15 +1,4 @@
# Default manifest in main script build1k.ps1
# $manifest = @{
# msvc = '143+';
# ndk = 'r23c+';
# xcode = '13.0.0~14.2.0'; # range
# clang = '15.0.0+';
# gcc = '9.0.0+';
# cmake = '3.26.4+';
# ninja = '1.11.1+';
# jdk = '11.0.19+';
# cmdlinetools = '7.0+'; # android cmdlinetools
# }
# Default manifest, refer in build1k.ps1
# For maintaining axmol, halx99 contributed some PRs to https://gitlab.kitware.com/cmake
# 3.27.0: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8319
# 3.28.0: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8632
@ -20,12 +9,11 @@
# add or overwrite tool version like follow
$manifest['nuget'] = '5.5.1' # since 5.6.0, require .net 4.0
$manifest['glslcc'] = '1.9.3+'
$manifest['emsdk'] = '3.1.49'
if ($IsMacOS) {
# refer to: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8632
# once cmake-3.28.0 released, can simply specify cmake to '3.28.0+'
$manifest['cmake'] = '3.28.0-rc5'
$manifest['cmake'] = '3.28.0+'
}
# [void]$manifest

View File

@ -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) 2019-present Axmol Engine contributors (see AUTHORS.md).
#
# https://axmolengine.github.io/
#
@ -57,6 +57,14 @@ if(AX_BUILD_TESTS)
message(STATUS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}")
# download optional test assets
if (NOT IS_DIRECTORY "${_AX_ROOT}/tests/cpp-tests/Content")
_1kfetch(sample-assets "https://github.com/axmolengine/axmol-sample-assets.git")
_1klink("${sample-assets_SOURCE_DIR}/cpp-tests/Content" "${CMAKE_CURRENT_LIST_DIR}/tests/cpp-tests/Content")
_1klink("${sample-assets_SOURCE_DIR}/fairygui-tests/Content" "${CMAKE_CURRENT_LIST_DIR}/tests/fairygui-tests/Content")
_1klink("${sample-assets_SOURCE_DIR}/live2d-tests/Content" "${CMAKE_CURRENT_LIST_DIR}/tests/live2d-tests/Content")
endif()
macro(add_test_target target_name dir)
add_subdirectory(${dir} ${CMAKE_BINARY_DIR}/tests/${target_name})
set_target_properties(${target_name} PROPERTIES FOLDER "Apps")

View File

@ -5,9 +5,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software
Copyright (c) 2019-2020 HALX99
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

204
build.ps1 Normal file
View File

@ -0,0 +1,204 @@
#
# This script easy to build win32, linux, winuwp, ios, tvos, osx, android depends on $myRoot/1k/build.ps1
# usage: pwsh build.ps1 -p <targetPlatform> -a <arch>
# options
# -p: build target platform: win32,winuwp,linux,android,osx,ios,tvos,wasm
# for android: will search ndk in sdk_root which is specified by env:ANDROID_HOME first,
# if not found, by default will install ndk-r16b or can be specified by option: -cc 'ndk-r23c'
# -a: build arch: x86,x64,armv7,arm64; for android can be list by ';', i.e: 'arm64;x64'
# -cc: toolchain: for win32 you can specific -cc clang to use llvm-clang, please install llvm-clang from https://github.com/llvm/llvm-project/releases
# -xc: additional cmake options: i.e. -xc '-Dbuild','-DCMAKE_BUILD_TYPE=Release'
# -xb: additional cross build options: i.e. -xb '--config','Release'
# -c(configOnly): no build, only generate natvie project file (vs .sln, xcodeproj)
# -d: specify project dir to compile, i.e. -d /path/your/project/
# examples:
# - win32:
# - pwsh build.ps1 -p win32
# - pwsh build.ps1 -p win32 -cc clang
# - winuwp: pwsh build.ps1 -p winuwp
# - linux: pwsh build.ps1 -p linux
# - android:
# - pwsh build.ps1 -p android -a arm64
# - pwsh build.ps1 -p android -a 'arm64;x64'
# - osx:
# - pwsh build.ps1 -p osx -a x64
# - pwsh build.ps1 -p osx -a arm64
# - ios: pwsh build.ps1 -p ios -a x64
# - tvos: pwsh build.ps1 -p tvos -a x64
# - wasm: pwsh build.ps1 -p wasm
# build.ps1 without any arguments:
# - pwsh build.ps1
# on windows: target platform is win32, arch=x64
# on linux: target platform is linux, arch=x64
# on macos: target platform is osx, arch=x64
#
param(
[switch]$configOnly,
[switch]$forceConfig
)
$options = @{p = $null; a = $null; d = $null; cc = $null; xc = @(); xb = @(); sdk = $null; dll = $false }
$optName = $null
foreach ($arg in $args) {
if (!$optName) {
if ($arg.StartsWith('-')) {
$optName = $arg.SubString(1).TrimEnd(':')
}
}
else {
if ($options.Contains($optName)) {
$options[$optName] = $arg
}
$optName = $null
}
}
function translate_array_opt($opt) {
if ($opt -and $opt.GetType().BaseType -ne [array]) {
$opt = "$opt".Split(',')
}
return $opt
}
if ($options.xb.Count -ne 0) {
[array]$options.xb = (translate_array_opt $options.xb)
}
if ($options.xc.Count -ne 0) {
[array]$options.xc = (translate_array_opt $options.xc)
}
$myRoot = $PSScriptRoot
$workDir = $(Get-Location).Path
# axroot
$AX_ROOT = $env:AX_ROOT
if (!$AX_ROOT -and (Test-Path "$myRoot/core/axmolver.h.in" -PathType Leaf)) {
$AX_ROOT = $myRoot
$env:AX_ROOT = $AX_ROOT
}
# b1kroot preferred axmol, but b1k(1k,build.ps1) can be copy to any isolated directory to work
$b1k_root = $AX_ROOT
if(!$b1k_root) {
if(Test-Path "$myRoot/1k/build.ps1" -PathType Leaf) {
$b1k_root = $myRoot
}
else {
throw "The 1k/build.ps1 not found"
}
}
$source_proj_dir = if($options.d) { $options.d } else { $workDir }
$is_engine = ($source_proj_dir -eq $AX_ROOT)
$is_android = $options.p -eq 'android'
$is_ci = $env:GITHUB_ACTIONS -eq 'true'
# start construct full cmd line
$b1k_script = (Resolve-Path -Path "$b1k_root/1k/build.ps1").Path
$b1k_args = @()
if ($is_engine -and $is_android) {
if ($is_ci) {
$source_proj_dir = Join-Path $myRoot 'tests/cpp-tests'
} else {
$source_proj_dir = Join-Path $myRoot 'templates/cpp-template-default'
}
}
$search_paths = if ($source_proj_dir -ne $myRoot) { @($source_proj_dir, $myRoot) } else { @($source_proj_dir) }
function search_proj_file($file_path, $type) {
foreach ($search_path in $search_paths) {
$full_path = Join-Path $search_path $file_path
if (Test-Path $full_path -PathType $type) {
# $ret_path = if ($type -eq 'Container') { $full_path } else { $search_path }
return $search_path
}
}
return $null
}
$proj_dir = search_proj_file 'CMakeLists.txt' 'Leaf'
$proj_name = (Get-Item $proj_dir).BaseName
$use_gradle = $is_android -and (Test-Path $(Join-Path $proj_dir 'proj.android/gradlew') -PathType Leaf)
if ($use_gradle) {
$b1k_args += '-xt', 'proj.android/gradlew'
}
if (!$use_gradle) {
$cm_target_index = $options.xb.IndexOf('--target')
if ($cm_target_index -eq -1) {
# non android, specific cmake target
$cmake_targets = @(
# local developer
@(
# project
$proj_name,
# engine
'HelloCpp'
),
# github actions
@(
# project
$proj_name,
# engine
'cpp_tests'
)
)
$cmake_target = $cmake_targets[$is_ci][$is_engine]
# reason:
# - android package not accept '-'
# - ios deploy device may failed with unknown error
$cmake_target = $cmake_target.Replace('-', '_')
$options.xb += '--target', $cmake_target
} else {
$cmake_target = $options.xb[$cm_target_index + 1]
}
if($is_android) {
if ($options.xc.IndexOf('-DANDROID_STL')) {
$options.xc += '-DANDROID_STL=c++_shared'
}
}
} else { # android gradle
# engine ci
if ($is_engine -and $is_ci) {
$options.xc += "-PRELEASE_STORE_FILE=$AX_ROOT/tools/ci/axmol-ci.jks", '-PRELEASE_STORE_PASSWORD=axmol-ci', '-PRELEASE_KEY_ALIAS=axmol-ci', '-PRELEASE_KEY_PASSWORD=axmol-ci'
}
}
if ($proj_dir) {
$b1k_args += '-d', "$proj_dir"
}
$prefix = Join-Path $b1k_root 'tools/external'
$b1k_args += '-prefix', "$prefix"
# remove arg we don't want forward to
$options.Remove('d')
$b1k_args = [System.Collections.ArrayList]$b1k_args
foreach ($option in $options.GetEnumerator()) {
if ($option.Value) {
$null = $b1k_args.Add("-$($option.Key)")
$null = $b1k_args.Add($option.Value)
}
}
$forward_args = @{}
if ($configOnly) {
$forward_args['configOnly'] = $true
}
if ($forceConfig) {
$forward_args['forceConfig'] = $true
}
. $b1k_script @b1k_args @forward_args
if (!$configOnly) {
$b1k.pause('Build done')
}
else {
$b1k.pause('Generate done')
}

View File

@ -218,9 +218,9 @@ function(ax_sync_target_dlls ax_target)
if (WIN32 AND AX_GLES_PROFILE)
add_custom_command(TARGET ${ax_target} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libGLESv2.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libEGL.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/d3dcompiler_47.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libGLESv2.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libEGL.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/d3dcompiler_47.dll
$<TARGET_FILE_DIR:${ax_target}>
)
endif()
@ -527,13 +527,13 @@ macro(ax_setup_winrt_sources )
if (NOT prebuilt_dlls)
set(prebuilt_dlls
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/zlib/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/zlib1.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/openssl/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libssl-3-x64.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/openssl/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libcrypto-3-x64.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/curl/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libcurl.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libGLESv2.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libEGL.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/d3dcompiler_47.dll)
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/zlib/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/zlib1.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/openssl/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libssl-3-x64.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/openssl/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libcrypto-3-x64.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/curl/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libcurl.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libGLESv2.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libEGL.dll
${_AX_ROOT}/${_AX_THIRDPARTY_NAME}/angle/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/d3dcompiler_47.dll)
endif()
ax_mark_multi_resources(prebuilt_dlls RES_TO "." FILES ${prebuilt_dlls})

View File

@ -92,18 +92,18 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
PRIVATE ${AX_ROOT_DIR}/extensions/spine/runtime/include
PRIVATE ${AX_ROOT_DIR}/extensions/fairygui
PRIVATE ${AX_ROOT_DIR}/extensions/GUI
PRIVATE ${AX_ROOT_DIR}/thirdparty/zlib/include
PRIVATE ${AX_ROOT_DIR}/thirdparty/jpeg-turbo/include
PRIVATE ${AX_ROOT_DIR}/thirdparty/openssl/include
PRIVATE ${AX_ROOT_DIR}/thirdparty/curl/include
PRIVATE ${AX_ROOT_DIR}/thirdparty/zlib/_d/include
PRIVATE ${AX_ROOT_DIR}/thirdparty/jpeg-turbo/_d/include
PRIVATE ${AX_ROOT_DIR}/thirdparty/openssl/_d/include
PRIVATE ${AX_ROOT_DIR}/thirdparty/curl/_d/include
)
SET (CONFIGURATION_SUBFOLDER "")
target_link_directories(${APP_NAME}
PRIVATE ${AX_ROOT_DIR}/thirdparty/openssl/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}
PRIVATE ${AX_ROOT_DIR}/thirdparty/zlib/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}
PRIVATE ${AX_ROOT_DIR}/thirdparty/jpeg-turbo/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}
PRIVATE ${AX_ROOT_DIR}/thirdparty/curl/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}
PRIVATE ${AX_ROOT_DIR}/thirdparty/openssl/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}
PRIVATE ${AX_ROOT_DIR}/thirdparty/zlib/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}
PRIVATE ${AX_ROOT_DIR}/thirdparty/jpeg-turbo/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}
PRIVATE ${AX_ROOT_DIR}/thirdparty/curl/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}
PRIVATE ${AX_ROOT_DIR}/${AX_PREBUILT_DIR}/lib # cmake will auto add suffix '/$(Configuration)', refer to https://github.com/Kitware/CMake/blob/master/Source/cmVisualStudio10TargetGenerator.cxx#L4145
)
@ -184,10 +184,10 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
endif()
add_custom_command(TARGET ${APP_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${AX_ROOT_DIR}/thirdparty/openssl/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libcrypto-3${ssl_dll_suffix}.dll"
"${AX_ROOT_DIR}/thirdparty/openssl/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libssl-3${ssl_dll_suffix}.dll"
"${AX_ROOT_DIR}/thirdparty/curl/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libcurl.dll"
"${AX_ROOT_DIR}/thirdparty/zlib/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/zlib1.dll"
"${AX_ROOT_DIR}/thirdparty/openssl/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libcrypto-3${ssl_dll_suffix}.dll"
"${AX_ROOT_DIR}/thirdparty/openssl/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libssl-3${ssl_dll_suffix}.dll"
"${AX_ROOT_DIR}/thirdparty/curl/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libcurl.dll"
"${AX_ROOT_DIR}/thirdparty/zlib/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/zlib1.dll"
"${AX_ROOT_DIR}/${AX_PREBUILT_DIR}/bin/${BUILD_CONFIG_DIR}OpenAL32.dll"
$<TARGET_FILE_DIR:${APP_NAME}>)
@ -212,9 +212,9 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
if (AX_GLES_PROFILE)
add_custom_command(TARGET ${APP_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${AX_ROOT_DIR}/thirdparty/angle/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libGLESv2.dll
${AX_ROOT_DIR}/thirdparty/angle/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/libEGL.dll
${AX_ROOT_DIR}/thirdparty/angle/prebuilt/${PLATFORM_NAME}/${ARCH_ALIAS}/d3dcompiler_47.dll
${AX_ROOT_DIR}/thirdparty/angle/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libGLESv2.dll
${AX_ROOT_DIR}/thirdparty/angle/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/libEGL.dll
${AX_ROOT_DIR}/thirdparty/angle/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}/d3dcompiler_47.dll
$<TARGET_FILE_DIR:${APP_NAME}>
)
endif()

View File

@ -68,29 +68,3 @@ if(CMAKE_GENERATOR STREQUAL Xcode)
elseif(CMAKE_GENERATOR MATCHES Visual)
set(VS TRUE)
endif()
# set platform specific path
set(_path_prefix ${CMAKE_CURRENT_SOURCE_DIR}/prebuilt/)
set(platform_spec_path "${_path_prefix}${PLATFORM_NAME}")
if(ANDROID OR WIN32)
set(platform_spec_path "${platform_spec_path}/${ARCH_ALIAS}")
endif()
### axpkg url
set (axpkg_ver v60)
set (axpkg_base_url "https://github.com/axmolengine/build1k/releases/download/${axpkg_ver}" CACHE STRING "" FORCE)
function(axpkg_require package_name dir)
if(NOT IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/prebuilt)
set (package_url "${axpkg_base_url}/${package_name}.zip")
message(AUTHOR_WARNING "Downloading ${package_url}")
if (NOT EXISTS ${dir}/${package_name}.zip)
file(DOWNLOAD ${package_url} ${dir}/${package_name}.zip)
endif()
file(ARCHIVE_EXTRACT INPUT ${dir}/${package_name}.zip DESTINATION ${dir}/)
file(RENAME ${dir}/${package_name}/include ${dir}/include)
file(RENAME ${dir}/${package_name}/prebuilt ${dir}/prebuilt)
file(REMOVE_RECURSE ${dir}/${package_name})
# file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/${package_name}.zip)
endif()
endfunction()

View File

@ -4,7 +4,7 @@ Copyright (c) 2011 Zynga Inc.
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,8 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,8 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,8 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2022 @aismann; Peter Eismann, Germany; dreifrankensoft
Copyright (c) 2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -3,7 +3,8 @@
* Copyright (c) 2012 cocos2d-x.org
* Copyright (c) 2013-2016 Chukong Technologies Inc.
* Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
* Copyright (c) 2021 Bytedance Inc.
* Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
*
* https://axmolengine.github.io/
*
* Permission is hereby granted, free of charge, to any person obtaining a copy

View File

@ -2,7 +2,7 @@
* Copyright (c) 2012 cocos2d-x.org
* Copyright (c) 2013-2016 Chukong Technologies Inc.
* Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
* Copyright (c) 2021 Bytedance Inc.
* Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal

View File

@ -2,7 +2,7 @@
* Copyright (c) 2012 cocos2d-x.org
* Copyright (c) 2013-2016 Chukong Technologies Inc.
* Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
* Copyright (c) 2021 Bytedance Inc.
* Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -3,7 +3,7 @@ Copyright (c) 2009 On-Core
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -3,7 +3,7 @@ Copyright (c) 2009 On-Core
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2013 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/axmol

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/axmol

View File

@ -5,7 +5,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -5,7 +5,7 @@
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -6,8 +6,7 @@
* Copyright (c) 2011 Marco Tillemans
* Copyright (c) 2013-2016 Chukong Technologies Inc.
* Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
* Copyright (c) 2020-2021 C4games Ltd.
* Copyright (c) 2021 Bytedance Inc.
* Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
*
* https://axmolengine.github.io/
*

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -3,7 +3,7 @@ Copyright (c) 2010 Lam Pham
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2017 Chukong Technologies Inc
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -3,7 +3,7 @@ Copyright (c) 2010 Lam Pham
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -3,7 +3,7 @@ Copyright (c) 2009 Jason Booth
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,8 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,8 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -5,7 +5,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -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-2023 Bytedance Inc.
# Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
#
# https://axmolengine.github.io/
#
@ -158,28 +158,30 @@ if (WIN32)
endif()
# axmolver.h
find_package(Git)
if(AX_UPDATE_BUILD_VERSION AND GIT_FOUND AND EXISTS "${_AX_ROOT}/.git")
find_program(GIT_COMMAND NAMES git)
if(AX_UPDATE_BUILD_VERSION AND GIT_COMMAND AND EXISTS "${_AX_ROOT}/.git")
# Get the current working branch and its latest abbreviated commit hash
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C "${_AX_ROOT}" rev-list --count HEAD
execute_process(COMMAND ${GIT_COMMAND} -C "${_AX_ROOT}" rev-list --count HEAD
TIMEOUT 5
OUTPUT_VARIABLE AX_BUILD_NUM
OUTPUT_STRIP_TRAILING_WHITESPACE)
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C "${_AX_ROOT}" branch --show-current
execute_process(COMMAND ${GIT_COMMAND} -C "${_AX_ROOT}" branch --show-current
TIMEOUT 5
OUTPUT_VARIABLE AX_GIT_BRANCH
OUTPUT_STRIP_TRAILING_WHITESPACE)
EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C "${_AX_ROOT}" rev-parse --short=7 HEAD
execute_process(COMMAND ${GIT_COMMAND} -C "${_AX_ROOT}" rev-parse --short=7 HEAD
TIMEOUT 5
OUTPUT_VARIABLE AX_GIT_COMMIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(AX_GIT_PRESENT 1)
else()
set(AX_GIT_BRANCH "UNKNOWN")
set(AX_GIT_COMMIT_HASH "unknown")
set(AX_GIT_PRESENT 0)
endif()
configure_file(
"${CMAKE_CURRENT_LIST_DIR}/axmolver.h.in"
"${CMAKE_CURRENT_LIST_DIR}/axmolver.h")
"${CMAKE_CURRENT_LIST_DIR}/axmolver.h" @ONLY)
# early experimental features
# include(CMakeDependentOption)

View File

@ -1,9 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018-2020 HALX99.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018-2020 simdsoft.com, @HALX99
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018 HALX99.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018 HALX99.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018-2020 HALX99.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,6 +1,6 @@
/****************************************************************************
Copyright (c) 2018-2020 HALX99.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,5 @@
/****************************************************************************
Copyright (c) 2018-2019 HALX99.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018 HALX99.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018 HALX99.
Copyright (c) 2021-2023 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018-2020 HALX99.
Copyright (c) 2021-2023 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018-2020 HALX99.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2016-2017 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018 HALX99.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018-2020 HALX99.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2018 HALX99.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2023 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/
@ -35,7 +35,11 @@ NS_AX_BEGIN
AX_DLL const char* axmolVersion()
{
#if AX_GIT_PRESENT
return "axmol-" AX_VERSION_STR "-" AX_GIT_COMMIT_HASH;
#else
return "axmol-" AX_VERSION_STR;
#endif
}
AX_DLL const char* cocos2dVersion()

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -15,11 +15,14 @@
#define AX_VERSION_NUM AX_VERSION_MAKE(AX_VERSION_MAJOR, AX_VERSION_MINOR, AX_VERSION_PATCH)
#define AX_VERSION AX_VERSION_NUM
/* #Define indicate whether axmol/.git present */
#define AX_GIT_PRESENT @AX_GIT_PRESENT@
/* Define to the library build number from git commit count */
#define AX_BUILD_NUM "${AX_BUILD_NUM}"
#define AX_BUILD_NUM "@AX_BUILD_NUM@"
/* Define the branch being built */
#define AX_GIT_BRANCH "${AX_GIT_BRANCH}"
#define AX_GIT_BRANCH "@AX_GIT_BRANCH@"
/* Define the hash of the head commit */
#define AX_GIT_COMMIT_HASH "${AX_GIT_COMMIT_HASH}"
#define AX_GIT_COMMIT_HASH "@AX_GIT_COMMIT_HASH@"

View File

@ -1,6 +1,6 @@
/****************************************************************************
*
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -3,7 +3,7 @@ Copyright (c) 2010 Ricardo Quesada
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020-2021 C4games Ltd
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md)
https://axmolengine.github.io/

View File

@ -1,8 +1,7 @@
/****************************************************************************
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2021-2023 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2023 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2013 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,7 +4,7 @@
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2019 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,6 +1,6 @@
/****************************************************************************
Copyright (c) 2023 HALX99.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,6 +1,6 @@
/****************************************************************************
Copyright (c) 2023 HALX99.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -4,7 +4,7 @@ Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2011 Zynga Inc.
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2014 cocos2d-x.org
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2014 cocos2d-x.org
Copyright (c) 2014-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,8 +2,7 @@
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2017-2020 C4games Ltd.
Copyright (c) 2021-2022 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2017-2020 C4games Ltd.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,8 +2,7 @@
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd
Copyright (c) 2021-2023 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,8 +2,7 @@
Copyright (c) 2010 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd
Copyright (c) 2021-2023 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2013-2017 Chukong Technologies
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -1,7 +1,7 @@
/****************************************************************************
Copyright (c) 2013-2017 Chukong Technologies
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2021 Bytedance Inc.
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md).
https://axmolengine.github.io/

View File

@ -2,7 +2,7 @@
Copyright (c) 2010-2012 cocos2d-x.org
Copyright (c) 2013-2016 Chukong Technologies Inc.
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
Copyright (c) 2020 C4games Ltd
Copyright (c) 2019-present Axmol Engine contributors (see AUTHORS.md)
https://axmolengine.github.io/

Some files were not shown because too many files have changed in this diff Show More