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

Update name

This commit is contained in:
halx99 2021-06-01 20:31:48 +08:00
parent 9ff67f5087
commit 5effccdb3c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Modules/CocosConfigDefine.cmake
View File

@ -85,12 +85,12 @@ if(WINDOWS)
# Visual Studio 2015, MSVC_VERSION 1900 (v140 toolset) # Visual Studio 2015, MSVC_VERSION 1900 (v140 toolset)
# Visual Studio 2017, MSVC_VERSION 1910-1919 (v141 toolset) # Visual Studio 2017, MSVC_VERSION 1910-1919 (v141 toolset)
if(${MSVC_VERSION} EQUAL 1900 OR ${MSVC_VERSION} GREATER 1900) if(${MSVC_VERSION} EQUAL 1900 OR ${MSVC_VERSION} GREATER 1900)
message(STATUS "using Windows MSVC generate cocos2d-x project, MSVC_VERSION:${MSVC_VERSION}") message(STATUS "using Windows MSVC generate adxe project, MSVC_VERSION:${MSVC_VERSION}")
else() else()
message(FATAL_ERROR "using Windows MSVC generate cocos2d-x project, MSVC_VERSION:${MSVC_VERSION} lower than needed") message(FATAL_ERROR "using Windows MSVC generate adxe project, MSVC_VERSION:${MSVC_VERSION} lower than needed")
endif() endif()
else() else()
message(FATAL_ERROR "please using Windows MSVC compile cocos2d-x project, support other compile tools not yet") message(FATAL_ERROR "please using Windows MSVC compile adxe project, support other compile tools not yet")
endif() endif()
endif() endif()

16
cmake/Modules/PreventInSourceBuilds.cmake
View File

@ -9,23 +9,23 @@ function(AssureOutOfSourceBuilds)
# disallow in-source builds # disallow in-source builds
if("${srcdir}" STREQUAL "${bindir}") if("${srcdir}" STREQUAL "${bindir}")
message("######################################################") message("######################################################")
message("# Cocos2d-x should not be configured & built in the Cocos2d-x source directory") message("# adxe should not be configured & built in the adxe source directory")
message("# You must run cmake in a build directory.") message("# You must run cmake in a build directory.")
message("# For example:") message("# For example:")
message("# mkdir Cocos ; cd Cocos") message("# mkdir Cocos ; cd Cocos")
message("# download & unpack the Cocos2d-x tarball") message("# download & unpack the adxe tarball")
message("# mkdir Cocos2d-x-Build") message("# mkdir adxe-Build")
message("# this will create the following directory structure") message("# this will create the following directory structure")
message("#") message("#")
message("# Cocos") message("# Cocos")
message("# +--Cocos2d-x") message("# +--adxe")
message("# +--Cocos2d-x-Build") message("# +--adxe-Build")
message("#") message("#")
message("# Then you can proceed to configure and build") message("# Then you can proceed to configure and build")
message("# by using the following commands") message("# by using the following commands")
message("#") message("#")
message("# cd Cocos2d-x-Build") message("# cd adxe-Build")
message("# cmake ../Cocos2d-x # or ccmake, or cmake-gui ") message("# cmake ../adxe # or ccmake, or cmake-gui ")
message("# make") message("# make")
message("#") message("#")
message("# NOTE: Given that you already tried to make an in-source build") message("# NOTE: Given that you already tried to make an in-source build")
@ -33,7 +33,7 @@ function(AssureOutOfSourceBuilds)
message("# in your source tree. run 'git status' to find them and") message("# in your source tree. run 'git status' to find them and")
message("# remove them by doing:") message("# remove them by doing:")
message("#") message("#")
message("# cd Cocos/Cocos2d-x") message("# cd Cocos/adxe")
message("# git clean -n -d") message("# git clean -n -d")
message("# git clean -f -d") message("# git clean -f -d")
message("# git checkout --") message("# git checkout --")