From 27d9efd6c1c6ca6ec1e68ec1a480368e6895e733 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Sun, 7 Oct 2018 21:25:37 +0200 Subject: [PATCH] Remove dependency on libcairo2 Fixes #862. --- lib/libappimage | 2 +- src/CMakeLists.txt | 11 +++++++---- src/digest_md5.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/libappimage b/lib/libappimage index d00aee7a9..ab44b7b3f 160000 --- a/lib/libappimage +++ b/lib/libappimage @@ -1 +1 @@ -Subproject commit d00aee7a9b74895d70c2ced8e65e4e5461947fc9 +Subproject commit ab44b7b3fda3ec286ed3b001aa58d3d282828419 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8a7b0aeb2..eddeca6d8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,7 +33,10 @@ target_link_libraries(appimagetool ${CMAKE_DL_LIBS} squashfuse xdg-basedir - libappimage_static + libappimage_shared + libglib + libzlib + xz ) target_compile_definitions(appimagetool @@ -73,7 +76,7 @@ add_sanitizers(AppRun) add_executable(validate validate.c) target_link_libraries(validate - libappimage_static + libappimage_shared libglib libssl ) @@ -87,7 +90,7 @@ target_include_directories(validate add_executable(digest digest.c) target_link_libraries(digest - libappimage_static + libappimage_shared libssl ) @@ -105,7 +108,7 @@ target_include_directories(digest_md5 target_link_libraries(digest_md5 PRIVATE libglib - PRIVATE libappimage_static + PRIVATE libappimage_shared ) diff --git a/src/digest_md5.c b/src/digest_md5.c index 8e5b14f66..5285f20b5 100644 --- a/src/digest_md5.c +++ b/src/digest_md5.c @@ -2,7 +2,7 @@ #include #include -#include "appimage/appimage.h" +#include "appimage/appimage_shared.h" #include "getsection.h"