mirror of https://github.com/axmolengine/axmol.git
Merge branch 'master' of https://github.com/adxeproject/adxe
This commit is contained in:
halx99
commit
1925d9ea80
30
README.md
30
README.md
|
|
@ -1,12 +1,12 @@
|
||||||
# Engine-x
|
# Adxe
|
||||||
[](https://github.com/c4games/engine-x/releases)
|
[](https://github.com/adxeproject/adxe/releases)
|
||||||
[](https://github.com/c4games/engine-x/blob/master/LICENSE)
|
[](https://github.com/adxeproject/adxe/blob/master/LICENSE)
|
||||||
|
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Aandroid)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Aandroid)
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Aios)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Aios)
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Awin32)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Awin32)
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Alinux)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Alinux)
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Aosx)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Aosx)
|
||||||
|
|
||||||
**This is another more radical fork of *Cocos2d-x-4.0*, use OpenAL for all platforms, single texture multi GPU texture handler, C++ 14/17 and some more (see 'Highlight Features' for more info).**
|
**This is another more radical fork of *Cocos2d-x-4.0*, use OpenAL for all platforms, single texture multi GPU texture handler, C++ 14/17 and some more (see 'Highlight Features' for more info).**
|
||||||
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
* Usefull PRs from **you** are welcome (review/merge ASAP)
|
* Usefull PRs from **you** are welcome (review/merge ASAP)
|
||||||
|
|
||||||
### Highlight Features
|
### Highlight Features
|
||||||
* **More clearly third-party libs ['Upstream-Version-License'](external/README.md) for easy to publish your commercial apps based on engine-x**
|
* **More clearly third-party libs ['Upstream-Version-License'](external/README.md) for easy to publish your commercial apps based on adxe**
|
||||||
* Refactor AudioEngine, OpenAL for all platforms
|
* Refactor AudioEngine, OpenAL for all platforms
|
||||||
* [OpenAL Soft](https://github.com/kcat/openal-soft), pass -DBUILD_EXT_ALSOFT=ON to cmake to force enable it
|
* [OpenAL Soft](https://github.com/kcat/openal-soft), pass -DBUILD_EXT_ALSOFT=ON to cmake to force enable it
|
||||||
* [OpenAL.framework](https://opensource.apple.com/tarballs/OpenAL), if no ```BUILD_EXT_ALSOFT``` option specified, cmake script will choose it on osx/ios, even through it was mark as deprecated, but still available.
|
* [OpenAL.framework](https://opensource.apple.com/tarballs/OpenAL), if no ```BUILD_EXT_ALSOFT``` option specified, cmake script will choose it on osx/ios, even through it was mark as deprecated, but still available.
|
||||||
|
|
@ -42,13 +42,13 @@
|
||||||
### [Roadmap](issues/1)
|
### [Roadmap](issues/1)
|
||||||
|
|
||||||
### Quick Start
|
### Quick Start
|
||||||
Open [Wiki](https://github.com/c4games/engine-x-wiki) for additional information too.
|
Open [Wiki](https://github.com/adxeproject/adxe-wiki) for additional information too.
|
||||||
|
|
||||||
#### Common Requirement [Python](https://www.python.org/downloads/)
|
#### Common Requirement [Python](https://www.python.org/downloads/)
|
||||||
* Python-2.7.17+, Python-3.7+
|
* Python-2.7.17+, Python-3.7+
|
||||||
|
|
||||||
#### Prerequisites
|
#### Prerequisites
|
||||||
1. Enter ```engine-x``` root directory
|
1. Enter ```adxe``` root directory
|
||||||
2. Run ```python setup.py```, restart console after finish
|
2. Run ```python setup.py```, restart console after finish
|
||||||
|
|
||||||
#### Windows
|
#### Windows
|
||||||
|
|
@ -56,14 +56,14 @@ Open [Wiki](https://github.com/c4games/engine-x-wiki) for additional information
|
||||||
2. Install Visual Studio 2019 build (it's strong recommend you use this version)
|
2. Install Visual Studio 2019 build (it's strong recommend you use this version)
|
||||||
3. Execute follow command at command line (Console, Window Terminal or Powershell)
|
3. Execute follow command at command line (Console, Window Terminal or Powershell)
|
||||||
```bat
|
```bat
|
||||||
cd engine-x\
|
cd adxe\
|
||||||
cmake -S . -B build -G "Visual Studio 16 2019" -A Win32
|
cmake -S . -B build -G "Visual Studio 16 2019" -A Win32
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Android
|
#### Android
|
||||||
1. Install Android Studio 4.2+
|
1. Install Android Studio 4.2+
|
||||||
2. When first start Android Studio, It will guide you to install sdk and other tools, just install them
|
2. When first start Android Studio, It will guide you to install sdk and other tools, just install them
|
||||||
3. Start Android and choose [Open an existing Android Studio Project] to open ```engine-x\tests\cpp-tests\proj.android```
|
3. Start Android and choose [Open an existing Android Studio Project] to open ```adxe\tests\cpp-tests\proj.android```
|
||||||
4. Start Android Studio and Open [Tools][SDKManager], then switch to ```SDK Tools```, check the ```Show Package Details```, choose follow tools and click the button ```Apply``` to install them:
|
4. Start Android Studio and Open [Tools][SDKManager], then switch to ```SDK Tools```, check the ```Show Package Details```, choose follow tools and click the button ```Apply``` to install them:
|
||||||
* Android SDK Platform 29 r5
|
* Android SDK Platform 29 r5
|
||||||
* Android SDK Build-Tools 29.0.2
|
* Android SDK Build-Tools 29.0.2
|
||||||
|
|
@ -87,11 +87,11 @@ Open [Wiki](https://github.com/c4games/engine-x-wiki) for additional information
|
||||||
4. After cmake generate finish, you can open xcode project at ```build``` folder and run cpp-tests or other test targets.
|
4. After cmake generate finish, you can open xcode project at ```build``` folder and run cpp-tests or other test targets.
|
||||||
5. Notes
|
5. Notes
|
||||||
- **The code sign required to run ios app on device, just change bundle identifier until the auto manage signing solved**
|
- **The code sign required to run ios app on device, just change bundle identifier until the auto manage signing solved**
|
||||||
- **engine-x only provide armv7, arm64, x86_64 prebuilt libraries for ios**
|
- **adxe only provide armv7, arm64, x86_64 prebuilt libraries for ios**
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
* ThreadLocalStorage (TLS)
|
* ThreadLocalStorage (TLS)
|
||||||
- ios x86 simulator ios>=10 and engine-x no longer provide x86 libraries
|
- ios x86 simulator ios>=10 and adxe no longer provide x86 libraries
|
||||||
- ios x64 or devices (armv7, arm64) ios sdk>=9.0
|
- ios x64 or devices (armv7, arm64) ios sdk>=9.0
|
||||||
- the 'OpenAL Soft' maintained by kcat use TLS
|
- the 'OpenAL Soft' maintained by kcat use TLS
|
||||||
|
|
||||||
|
|
|
||||||
28
README_CN.md
28
README_CN.md
|
|
@ -1,13 +1,13 @@
|
||||||
# Engine-x
|
# Adxe
|
||||||
|
|
||||||
[](https://github.com/c4games/engine-x/releases)
|
[](https://github.com/adxeproject/adxe/releases)
|
||||||
[](https://github.com/c4games/engine-x/blob/master/LICENSE)
|
[](https://github.com/adxeproject/adxe/blob/master/LICENSE)
|
||||||
|
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Aandroid)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Aandroid)
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Aios)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Aios)
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Awin32)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Awin32)
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Alinux)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Alinux)
|
||||||
[](https://github.com/c4games/engine-x/actions?query=workflow%3Aosx)
|
[](https://github.com/adxeproject/adxe/actions?query=workflow%3Aosx)
|
||||||
|
|
||||||
|
|
||||||
**这是另外一个基于 *Cocos2d-x-4.0* 持续维护的分支, 全平台基于OpenAL, c++14/17...**
|
**这是另外一个基于 *Cocos2d-x-4.0* 持续维护的分支, 全平台基于OpenAL, c++14/17...**
|
||||||
|
|
@ -41,7 +41,7 @@
|
||||||
* 新增硬件压缩纹理格式ETC2 RGB/RGBA支持，支持软解
|
* 新增硬件压缩纹理格式ETC2 RGB/RGBA支持，支持软解
|
||||||
* **ImGui集成，非常方便写游戏内嵌小工具，用法详见[ImGuiEXT](extensions/ImGuiEXT/README.md)**
|
* **ImGui集成，非常方便写游戏内嵌小工具，用法详见[ImGuiEXT](extensions/ImGuiEXT/README.md)**
|
||||||
|
|
||||||
### [Roadmap](https://github.com/c4games/engine-x/issues/1)
|
### [Roadmap](https://github.com/adxeproject/adxe/issues/1)
|
||||||
|
|
||||||
### 快速开始
|
### 快速开始
|
||||||
|
|
||||||
|
|
@ -49,7 +49,7 @@
|
||||||
* python-2.7.17+, python-3.7+都可以
|
* python-2.7.17+, python-3.7+都可以
|
||||||
|
|
||||||
#### 准备步骤
|
#### 准备步骤
|
||||||
1. 进入引擎```engine-x```根目录
|
1. 进入引擎```adxe```根目录
|
||||||
3. 执行```python setup.py```后重启控制台
|
3. 执行```python setup.py```后重启控制台
|
||||||
|
|
||||||
#### Windows
|
#### Windows
|
||||||
|
|
@ -57,10 +57,10 @@
|
||||||
2. 确保 Visual Studio 2019 已正确安装
|
2. 确保 Visual Studio 2019 已正确安装
|
||||||
3. 执行下面的命令
|
3. 执行下面的命令
|
||||||
```bat
|
```bat
|
||||||
cd engine-x
|
cd adxe
|
||||||
cmake -S . -B build -G "Visual Studio 16 2019" -A Win32
|
cmake -S . -B build -G "Visual Studio 16 2019" -A Win32
|
||||||
```
|
```
|
||||||
4. 之后就可以用vs打开```engine-x/build/engine-x.sln```启动cpp-tests等测试工程了
|
4. 之后就可以用vs打开```adxe/build/adxe.sln```启动cpp-tests等测试工程了
|
||||||
|
|
||||||
#### Android
|
#### Android
|
||||||
1. 安装 Android Studio 4.2或更高版本
|
1. 安装 Android Studio 4.2或更高版本
|
||||||
|
|
@ -91,7 +91,7 @@
|
||||||
|
|
||||||
### 注意
|
### 注意
|
||||||
* ThreadLocalStorage线程本地存储
|
* ThreadLocalStorage线程本地存储
|
||||||
- ios x86 simulator ios>=10 and engine-x no longer provide x86 libraries
|
- ios x86 simulator ios>=10 and adxe no longer provide x86 libraries
|
||||||
- ios x64 or devices(armv7,arm64) ios sdk>=9.0
|
- ios x64 or devices(armv7,arm64) ios sdk>=9.0
|
||||||
- the openal-soft maintained by kcat use TLS
|
- the openal-soft maintained by kcat use TLS
|
||||||
|
|
||||||
|
|
@ -101,4 +101,4 @@
|
||||||
|
|
||||||
### 参考链接
|
### 参考链接
|
||||||
* official v4: https://gitee.com/mirrors/cocos2d-x
|
* official v4: https://gitee.com/mirrors/cocos2d-x
|
||||||
* Git快速手册: https://github.com/c4games/engine-x/wiki/Git-Guides
|
* Git快速手册: https://github.com/adxeproject/adxe/wiki/Git-Guides
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
echo "This Shell Script will install dependencies for cocos2d-x"
|
echo "This Shell Script will install dependencies for adxe"
|
||||||
echo -n "Are you continue? (y/n) "
|
echo -n "Are you continue? (y/n) "
|
||||||
read answer
|
read answer
|
||||||
if echo "$answer" | grep -iq "^y" ;then
|
if echo "$answer" | grep -iq "^y" ;then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue