Merge pull request #6094 from dumganhar/develop

Updates templates for linux platform
This commit is contained in:
James Chen 2014-04-01 16:52:25 +08:00
commit ed29ce8585
3 changed files with 9 additions and 1 deletions

View File

@ -232,7 +232,7 @@ add_subdirectory(external/unzip)
# tinyxml2 library
add_subdirectory(external/tinyxml2)
# xxhas library
# xxhash library
add_subdirectory(external/xxhash)
# audio

View File

@ -74,6 +74,7 @@ include_directories(
${COCOS2D_ROOT}/external/websockets/include/linux
${COCOS2D_ROOT}/external/spidermonkey/include/linux
${COCOS2D_ROOT}/external/linux-specific/fmod/include/${ARCH_DIR}
${COCOS2D_ROOT}/external/xxhash
)
link_directories(
@ -105,6 +106,9 @@ add_subdirectory(${COCOS2D_ROOT}/external/tinyxml2)
# audio
add_subdirectory(${COCOS2D_ROOT}/cocos/audio)
# xxhash library
add_subdirectory(${COCOS2D_ROOT}/external/xxhash)
# cocos base library
add_subdirectory(${COCOS2D_ROOT}/cocos/base)

View File

@ -79,6 +79,7 @@ include_directories(
${COCOS2D_ROOT}/external/chipmunk/include/chipmunk
${COCOS2D_ROOT}/external/freetype2/include/linux
${COCOS2D_ROOT}/external/linux-specific/fmod/include/${ARCH_DIR}
${COCOS2D_ROOT}/external/xxhash
)
link_directories(
@ -109,6 +110,9 @@ add_subdirectory(${COCOS2D_ROOT}/external/tinyxml2)
# audio
add_subdirectory(${COCOS2D_ROOT}/cocos/audio)
# xxhash library
add_subdirectory(${COCOS2D_ROOT}/external/xxhash)
# cocos base library
add_subdirectory(${COCOS2D_ROOT}/cocos/base)