[aseprite] 296/308: Do not link manually to modp_b64 when using shared library.

[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 853bc16c6b8f39d63087de330a49357eafdc993c
Author: Tobias Hansen <thansen at localhost.localdomain>
Date:   Tue Mar 8 00:15:28 2016 +0000

    Do not link manually to modp_b64 when using shared library.
---
 debian/patches/shared_modp_b64.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/debian/patches/shared_modp_b64.patch b/debian/patches/shared_modp_b64.patch
index d295219..95d63ba 100644
--- a/debian/patches/shared_modp_b64.patch
+++ b/debian/patches/shared_modp_b64.patch
@@ -43,3 +43,27 @@
  
  namespace base {
  
+--- a/src/base/CMakeLists.txt
++++ b/src/base/CMakeLists.txt
+@@ -39,7 +39,9 @@
+     CACHE INTERNAL "Extra include directory for base lib")
+ 
+ include_directories(${BASE_INCLUDE_DIR})
+-include_directories(${MODP_B64_DIR})
++if(NOT USE_SHARED_MODP_B64)
++  include_directories(${MODP_B64_DIR})
++endif()
+ 
+ set(BASE_SOURCES
+   base64.cpp
+@@ -80,7 +82,9 @@
+ 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()
+ 
+ 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