mirror of https://github.com/axmolengine/axmol.git
Merge: 6a868299f5
9aebfd4b0d
Merge pull request #331 from c4games/cmake-improve Improve cmake scripts
This commit is contained in:
parent
b8892e446b
commit
4f0f713977
|
@ -151,7 +151,7 @@ set_target_properties(${ENGINEX_CORE_LIB}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
||||||
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
||||||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
|
||||||
VERSION "${ENGINEX_VERSION}"
|
VERSION "${ENGINEX_VERSION}"
|
||||||
FOLDER "Internal"
|
FOLDER "Internal"
|
||||||
)
|
)
|
||||||
|
|
|
@ -48,7 +48,7 @@ function(setup_cocos_extension_config target_name)
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
||||||
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
||||||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
|
||||||
FOLDER "Extensions"
|
FOLDER "Extensions"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue