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

Merge pull request #8679 from andyque/fixJenkinsError 

fix jenkins linux compile error and add protobuf to ignore list
This commit is contained in:
minggo 2014-10-14 16:10:05 +08:00
parent 6835aa73ba 5ea0f0c86a
commit f11c287ab6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -144,3 +144,4 @@ tests/cpp-tests/Resources/audio
/external/ConvertUTF/ /external/ConvertUTF/
/external/audio/ /external/audio/
/external/xxtea/ /external/xxtea/
/external/protobuf-lite/

7
CMakeLists.txt
View File

@ -152,8 +152,8 @@ endif()
# NB # NB
# we need to return these to libraries to their official state rather than # we need to return these to libraries to their official state rather than
# having our custom cocos2d namespace so that we may use system versions if # having our custom cocos2d namespace so that we may use system versions if
# the platform provides them. It is very important that this # the platform provides them. It is very important that this
# is done before we make prebuilt versions of these two libs # is done before we make prebuilt versions of these two libs
@ -188,8 +188,7 @@ if(NOT MINGW)
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/websockets/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include/${PLATFORM_FOLDER}
${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf-lite/src
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER}/freetype2 ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include/${PLATFORM_FOLDER}/freetype2
) )

2
cocos/CMakeLists.txt
View File

@ -53,7 +53,7 @@ include(editor-support/spine/CMakeLists.txt)
include(../extensions/CMakeLists.txt) include(../extensions/CMakeLists.txt)
set(COCOS_EDITOR_SUPPORT_SRC set(COCOS_EDITOR_SUPPORT_SRC
${COCOS_CCB_SRC} ${COCOS_CCB_SRC}
${COCOS_CS_SRC} ${COCOS_CS_SRC}
${COCOS_SPINE_SRC} ${COCOS_SPINE_SRC}
) )