[Performous-commit] Tapio Vierros : Add ImageMagick to cross-compilation script and enable building of ss_extract and friends .

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: fdf19b9feb2024f6e4ef85eeb326925ca268086f

Author: Tapio Vierros <tap...@gm...>
Date:   Mon Nov  1 21:38:13 2010 +0200

Add ImageMagick to cross-compilation script and enable building of ss_extract and friends.

---

 win32/cross-from-debian/makebuilddir.sh |    2 +-
 win32/cross-from-debian/makedeps.sh     |   15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/win32/cross-from-debian/makebuilddir.sh b/win32/cross-from-debian/makebuilddir.sh
index 3c469b9..e68eeb9 100755
--- a/win32/cross-from-debian/makebuilddir.sh
+++ b/win32/cross-from-debian/makebuilddir.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 mkdir -pv build
 cd build
-exec env PATH="`pwd`/../deps/bin:$PATH" cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain.cmake -DENABLE_TOOLS=OFF -DCMAKE_INSTALL_PREFIX="`pwd`/../stage" "$@" ../../..
+exec env PATH="`pwd`/../deps/bin:$PATH" cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain.cmake -DCMAKE_INSTALL_PREFIX="`pwd`/../stage" "$@" ../../..
diff --git a/win32/cross-from-debian/makedeps.sh b/win32/cross-from-debian/makedeps.sh
index b229876..8052d7a 100755
--- a/win32/cross-from-debian/makedeps.sh
+++ b/win32/cross-from-debian/makedeps.sh
@@ -573,6 +573,21 @@ if test ! -f "$PREFIX"/build-stamps/glew; then
   $RM_RF $GLEW
 fi
 
+# ImageMagick
+# Needed for tools (ss_extract) only.
+IM="ImageMagick-6.6.5-5"
+if test ! -f "$PREFIX"/build-stamps/imagemagick; then
+  download http://image_magick.veidrodis.com/image_magick/ImageMagick-6.6.5-5.tar.bz2
+  tar jxvf $IM.tar.bz2
+  cd $IM
+  ./configure $COMMON_AUTOCONF_FLAGS --without-rsvg --without-gslib --without-gvc --without-wmf --without-frozenpaths --without-x
+  make
+  make install
+  cd ..
+  touch "$PREFIX"/build-stamps/imagemagick
+  $RM_RF $IM
+fi
+
 # liborc
 LIBORC="orc-0.4.10"
 if test ! -f "$PREFIX"/build-stamps/liborc; then