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

cmake: protobuf should be linked with cocos2d.a in every platform (not only on linux)

This commit is contained in:
Vladimir Timofeev 2014-11-10 16:30:39 +03:00
parent e3e3de2d87
commit 0059c93757
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/CMakeLists.txt
View File

@ -146,7 +146,7 @@ elseif(WINDOWS)
set(PLATFORM_SPECIFIC_LIBS libjpeg libpng libwebp libtiff libcurl_imp libwebsockets freetype250 glfw3 glew32 opengl32 libiconv libzlib) set(PLATFORM_SPECIFIC_LIBS libjpeg libpng libwebp libtiff libcurl_imp libwebsockets freetype250 glfw3 glew32 opengl32 libiconv libzlib)
elseif(LINUX) elseif(LINUX)
set(PLATFORM_SPECIFIC_LIBS jpeg webp tiff freetype curl websockets ssl crypto set(PLATFORM_SPECIFIC_LIBS jpeg webp tiff freetype curl websockets ssl crypto
fontconfig png pthread glfw GLEW GL X11 rt z protobuf ${FMOD_LIB}) fontconfig png pthread glfw GLEW GL X11 rt z ${FMOD_LIB})
elseif(MACOSX OR APPLE) elseif(MACOSX OR APPLE)
INCLUDE_DIRECTORIES ( /System/Library/Frameworks ) INCLUDE_DIRECTORIES ( /System/Library/Frameworks )
@ -178,7 +178,7 @@ else()
message( FATAL_ERROR "Unsupported platform, CMake will exit" ) message( FATAL_ERROR "Unsupported platform, CMake will exit" )
endif() endif()
target_link_libraries(cocos2d chipmunk box2d tinyxml2 unzip xxhash ${PLATFORM_SPECIFIC_LIBS}) target_link_libraries(cocos2d chipmunk box2d protobuf tinyxml2 unzip xxhash ${PLATFORM_SPECIFIC_LIBS})
set_target_properties(cocos2d set_target_properties(cocos2d
PROPERTIES PROPERTIES