Use the full protobuf instead of protobuf-lite, to hopefully fix
a crash on Windows.
This commit is contained in:
parent
2bf8172590
commit
36ac3a2ec0
@ -116,18 +116,6 @@ if(${CMAKE_BUILD_TYPE} MATCHES "Release")
|
||||
add_definitions(-DQT_NO_DEBUG_OUTPUT)
|
||||
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
|
||||
add_definitions(${QT_DEFINITIONS})
|
||||
link_directories(${TAGLIB_LIBRARY_DIRS})
|
||||
|
1
dist/windows/clementine.nsi.in
vendored
1
dist/windows/clementine.nsi.in
vendored
@ -160,6 +160,7 @@ Section "Clementine" Clementine
|
||||
File "liborc-test-0.4-0.dll"
|
||||
File "libplist.dll"
|
||||
File "libpng14-14.dll"
|
||||
File "libprotobuf-7.dll"
|
||||
File "libprotobuf-lite-7.dll"
|
||||
File "libqjson.dll"
|
||||
File "libsoup-2.4-1.dll"
|
||||
|
@ -27,17 +27,9 @@ add_library(libclementine-common STATIC
|
||||
${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
|
||||
${protobuf}
|
||||
${PROTOBUF_LIBRARY}
|
||||
${TAGLIB_LIBRARIES}
|
||||
${CMAKE_THREAD_LIBS_INIT}
|
||||
chardet
|
||||
)
|
||||
|
||||
|
@ -21,9 +21,6 @@
|
||||
|
||||
package pb.spotify;
|
||||
|
||||
option optimize_for = LITE_RUNTIME;
|
||||
|
||||
|
||||
message LoginRequest {
|
||||
required string username = 1;
|
||||
optional string password = 2;
|
||||
|
@ -1,8 +1,5 @@
|
||||
package pb.tagreader;
|
||||
|
||||
option optimize_for = LITE_RUNTIME;
|
||||
|
||||
|
||||
message SongMetadata {
|
||||
enum Type {
|
||||
UNKNOWN = 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user