dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix discogs album cover fetching. Remove QJSON dependency.

Browse Source
This commit is contained in:
Jonas Kvinge
2018-03-02 22:51:42 +01:00
parent b2b1ba7abe
commit 2be8f88d73
9 changed files with 342 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@@ -56,7 +56,7 @@ include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
include_directories(${QXT_INCLUDE_DIRS})
include_directories(${SHA2_INCLUDE_DIRS})
include_directories(${CHROMAPRINT_INCLUDE_DIRS})
include_directories(${QJSON_INCLUDE_DIRS})
#include_directories(${QJSON_INCLUDE_DIRS})
find_package(OpenGL)
include_directories(${OPENGL_INCLUDE_DIR})
@@ -920,7 +920,7 @@ target_link_libraries(strawberry_lib
${QTSINGLEAPPLICATION_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${SQLITE_LIBRARIES}
${QJSON_LIBRARIES}
#${QJSON_LIBRARIES}
z
Qocoa
)
@@ -990,8 +990,8 @@ endif (APPLE)
set(3RDPARTY_SQLITE_LIBRARY qsqlite)
target_link_libraries(strawberry_lib qsqlite)
set(3RDPARTY_QJSON_LIBRARY qjson)
target_link_libraries(strawberry_lib qjson)
#set(3RDPARTY_QJSON_LIBRARY qjson)
#target_link_libraries(strawberry_lib qjson)
if (WIN32)
target_link_libraries(strawberry_lib