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

Merge pull request #12 from andyque/fixProbobufLinuxCompile 

fix linux compile
This commit is contained in:
pipu 2014-10-13 18:23:01 +08:00
parent 7dc837338e 96660cb653
commit e85f5d267b
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -220,6 +220,7 @@ add_subdirectory(external/Box2D)
add_subdirectory(external/unzip)
add_subdirectory(external/xxhash)
add_subdirectory(external/tinyxml2)
add_subdirectory(external/protobuf-lite)
endif()
# libcocos2d.a

2
cocos/CMakeLists.txt
View File

@ -125,7 +125,7 @@ elseif(WINDOWS)
set(PLATFORM_SPECIFIC_LIBS libjpeg libpng libwebp libtiff libcurl_imp libwebsockets freetype250 glfw3 glew32 opengl32 libiconv libzlib)
elseif(LINUX)
set(PLATFORM_SPECIFIC_LIBS jpeg webp tiff freetype curl websockets
fontconfig png pthread glfw GLEW GL X11 rt z ${FMOD_LIB})
fontconfig png pthread glfw GLEW GL X11 rt z protobuf ${FMOD_LIB})
elseif(MACOSX)
INCLUDE_DIRECTORIES ( /System/Library/Frameworks )

13
cocos/editor-support/cocostudio/CMakeLists.txt
View File

@ -61,19 +61,6 @@ set(COCOS_CS_SRC
editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp
editor-support/cocostudio/ActionTimeline/CSLoader.cpp
editor-support/cocostudio/CSParseBinary.pb.cc
../../../external/protocolBuf/src/google/protobuf/extension_set.cc
../../../external/protocolBuf/src/google/protobuf/generated_message_util.cc
../../../external/protocolBuf/src/google/protobuf/message_lite.cc
../../../external/protocolBuf/src/google/protobuf/repeated_field.cc
../../../external/protocolBuf/src/google/protobuf/wire_format_lite.cc
../../../external/protocolBuf/src/google/protobuf/io/coded_stream.cc
../../../external/protocolBuf/src/google/protobuf/io/zero_copy_stream.cc
../../../external/protocolBuf/src/google/protobuf/io/zero_copy_stream_impl.cc
../../../external/protocolBuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
../../../external/protocolBuf/src/google/protobuf/stubs/common.cc
../../../external/protocolBuf/src/google/protobuf/stubs/once.cc
../../../external/protocolBuf/src/google/protobuf/stubs/stringprintf.cc
)
include_directories( editor-support )