[aseprite] 297/308: Always link against modp_b64.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 1eda8e7d2d09f37edbfcb8440b520c6f6d6696c0
Author: Tobias Hansen <thansen at localhost.localdomain>
Date:   Tue Mar 8 00:33:11 2016 +0000

    Always link against modp_b64.
---
 debian/patches/shared_modp_b64.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/shared_modp_b64.patch b/debian/patches/shared_modp_b64.patch
index 95d63ba..f4eee30 100644
--- a/debian/patches/shared_modp_b64.patch
+++ b/debian/patches/shared_modp_b64.patch
@@ -8,13 +8,15 @@
  option(USE_SHARED_ALLEGRO4 "Use shared Allegro 4 library (without resize support)" off)
  option(USE_ALLEG4_BACKEND "Use Allegro 4 backend" on)
  option(USE_SKIA_BACKEND   "Use Skia backend" off)
-@@ -274,6 +275,12 @@
+@@ -274,6 +275,14 @@
  endif()
  include_directories(${LIBCURL_INCLUDE_DIR})
  
 +if(USE_SHARED_MODP_B64)
 +  find_library(LIBMODP_LIBRARY NAMES modpbase64)
 +  find_path(LIBMODP_INCLUDE_DIR NAMES modp_b64.h)
++else()
++  set(LIBMODP_LIBRARY modp_b64)
 +endif()
 +include_directories(${LIBMODP_INCLUDE_DIR})
 +
@@ -56,14 +58,12 @@
  
  set(BASE_SOURCES
    base64.cpp
-@@ -80,7 +82,9 @@
+@@ -80,7 +82,7 @@
  endif()
  
  add_library(base-lib ${BASE_SOURCES})
 -target_link_libraries(base-lib modp_b64)
-+if(NOT USE_SHARED_MODP_B64)
-+  target_link_libraries(base-lib modp_b64)
-+endif()
++target_link_libraries(base-lib ${LIBMODP_LIBRARY})
  
  if(WIN32)
    target_link_libraries(base-lib dbghelp shlwapi)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git