Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the full protobuf instead of protobuf-lite, to hopefully fix

Browse Source 
a crash on Windows.
This commit is contained in:
David Sansome 2012-11-11 18:55:16 +11:00 committed by David Sansome
parent 2bf8172590
commit 36ac3a2ec0
5 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -116,18 +116,6 @@ if(${CMAKE_BUILD_TYPE} MATCHES "Release")
add_definitions(-DQT_NO_DEBUG_OUTPUT) add_definitions(-DQT_NO_DEBUG_OUTPUT)
endif(${CMAKE_BUILD_TYPE} MATCHES "Release") endif(${CMAKE_BUILD_TYPE} MATCHES "Release")
# Use protobuf-lite if it's available
set(USE_PROTOBUF_LITE ON CACHE BOOL "Use protobuf-lite instead of protobuf if available")
find_library(PROTOBUF_LITE_LIBRARY protobuf-lite)
if(NOT PROTOBUF_LITE_LIBRARY)
# Lucid doesn't have a .so symlink
find_file(PROTOBUF_LITE_LIBRARY
NAMES libprotobuf-lite.so.5
PATH_SUFFIXES lib
)
endif(NOT PROTOBUF_LITE_LIBRARY)
# Set up definitions and paths # Set up definitions and paths
add_definitions(${QT_DEFINITIONS}) add_definitions(${QT_DEFINITIONS})
link_directories(${TAGLIB_LIBRARY_DIRS}) link_directories(${TAGLIB_LIBRARY_DIRS})

1
dist/windows/clementine.nsi.in vendored
View File

@ -160,6 +160,7 @@ Section "Clementine" Clementine
File "liborc-test-0.4-0.dll" File "liborc-test-0.4-0.dll"
File "libplist.dll" File "libplist.dll"
File "libpng14-14.dll" File "libpng14-14.dll"
File "libprotobuf-7.dll"
File "libprotobuf-lite-7.dll" File "libprotobuf-lite-7.dll"
File "libqjson.dll" File "libqjson.dll"
File "libsoup-2.4-1.dll" File "libsoup-2.4-1.dll"

10
ext/libclementine-common/CMakeLists.txt
View File

@ -27,17 +27,9 @@ add_library(libclementine-common STATIC
${MOC} ${MOC}
) )
# Use protobuf-lite if it's available
if(PROTOBUF_LITE_LIBRARY AND USE_PROTOBUF_LITE)
set(protobuf ${PROTOBUF_LITE_LIBRARY})
else(PROTOBUF_LITE_LIBRARY AND USE_PROTOBUF_LITE)
set(protobuf ${PROTOBUF_LIBRARY})
endif(PROTOBUF_LITE_LIBRARY AND USE_PROTOBUF_LITE)
target_link_libraries(libclementine-common target_link_libraries(libclementine-common
${protobuf} ${PROTOBUF_LIBRARY}
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
chardet chardet
) )

3
ext/libclementine-spotifyblob/spotifymessages.proto
View File

@ -21,9 +21,6 @@
package pb.spotify; package pb.spotify;
option optimize_for = LITE_RUNTIME;
message LoginRequest { message LoginRequest {
required string username = 1; required string username = 1;
optional string password = 2; optional string password = 2;

3
ext/libclementine-tagreader/tagreadermessages.proto
View File

@ -1,8 +1,5 @@
package pb.tagreader; package pb.tagreader;
option optimize_for = LITE_RUNTIME;
message SongMetadata { message SongMetadata {
enum Type { enum Type {
UNKNOWN = 0; UNKNOWN = 0;