Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'adxeproject:dev' into dev

This commit is contained in:
aismann 2021-08-27 07:49:17 +02:00 committed by GitHub
parent cbeeb8d8ab 3990cc765d
commit 1c05947474
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -3,9 +3,9 @@
[![dev](https://img.shields.io/badge/v1.0.0-beta2-yellow.svg)](https://github.com/adxeproject/adxe/releases)
[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/adxeproject/adxe/blob/master/LICENSE)
[![Windows Build Status](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml/badge.svg)](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml)
[![Android Build Status](https://github.com/adxeproject/adxe/workflows/android/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aandroid)
[![iOS Build Status](https://github.com/adxeproject/adxe/workflows/ios/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aios)
[![Windows Build Status](https://github.com/adxeproject/adxe/workflows/win32/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Awin32)
[![Linux Build Status](https://github.com/adxeproject/adxe/workflows/linux/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Alinux)
[![macOS Build Status](https://github.com/adxeproject/adxe/workflows/osx/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aosx)

2
README_CN.md
View File

@ -4,9 +4,9 @@
[![dev](https://img.shields.io/badge/v1.0.0-beta2-yellow.svg)](https://github.com/adxeproject/adxe/releases)
[![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/adxeproject/adxe/blob/master/LICENSE)
[![Windows Build Status](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml/badge.svg)](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml)
[![Android Build Status](https://github.com/adxeproject/adxe/workflows/android/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aandroid)
[![iOS Build Status](https://github.com/adxeproject/adxe/workflows/ios/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aios)
[![Windows Build Status](https://github.com/adxeproject/adxe/workflows/win32/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Awin32)
[![Linux Build Status](https://github.com/adxeproject/adxe/workflows/linux/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Alinux)
[![macOS Build Status](https://github.com/adxeproject/adxe/workflows/osx/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aosx)

35
extensions/x-studio.cmake
View File

@ -1,35 +0,0 @@
# x-studio spec extensions
if(BUILD_EXTENSION_XS_IDE)
## libeditor
add_subdirectory(libeditor)
if(BUILD_EXTENSION_SPINE)
target_compile_definitions(libeditor PUBLIC CC_BUILD_WITH_SPINE=1)
if(BUILD_SHARED_LIBS)
target_link_libraries(libeditor spine particle3d)
else()
target_include_directories(libeditor PUBLIC ${CMAKE_CURRENT_LIST_DIR}/spine/runtime/include)
endif()
endif()
## libccs30
add_subdirectory(libccs30)
if(BUILD_EXTENSION_DRAGONBONES)
target_compile_definitions(libccs30 PRIVATE CC_BUILD_WITH_DRANGBONES=1)
if(BUILD_SHARED_LIBS)
target_link_libraries(libccs30 DragonBones)
endif()
endif()
target_link_libraries(libccs30 libeditor)
## libccs19
add_subdirectory(libccs19)
target_link_libraries(libccs19 libeditor)
## libccs20
add_subdirectory(libccs20)
target_link_libraries(libccs20 libeditor)
## libccs21
add_subdirectory(libccs21)
target_link_libraries(libccs21 libeditor)
endif()