Permalink
Browse files

Remove dependency against ImageMagick

  • Loading branch information...
1 parent 1fa2503 commit a5fe850597a401092a4fd467aa5c5fdc66904bdd @Malvineous committed Oct 29, 2011
Showing with 0 additions and 30 deletions.
  1. +0 −24 configure.ac
  2. +0 −3 src/Makefile.am
  3. +0 −1 src/tls-hocus.cpp
  4. +0 −1 src/tls-wacky.cpp
  5. +0 −1 src/tls-wordresc.cpp
View
@@ -47,30 +47,6 @@ CPPFLAGS=$SAVE_CPPFLAGS
# Checks for library functions.
-# Check for ImageMagick and Magick++ (borrowed from zbar.sourceforge.net)
-AC_ARG_VAR([MAGICKXX_CONFIG], [full path to Magick++-config program])
-AC_CHECK_TOOL([MAGICKXX_CONFIG], [Magick++-config], [:])
-AS_IF([test "x$MAGICKXX_CONFIG" = "x:"],
- [AC_CHECK_TOOL([CONVERT], [convert])
- AS_IF([test "x$CONVERT" != "x" && \
- convert -version | grep ImageMagick >/dev/null 2>&1],
- [AC_MSG_FAILURE([test for Magick++ interface failed!
-although ImageMagick programs appear to be installed?
-
-Make sure you install any ImageMagick development packages
-provided by your distribution.
-])],
- [AC_MSG_FAILURE([test for ImageMagick failed!
-
-Please install ImageMagick and Magick++
-])]
-)])
-AC_SUBST([MAGICK_CPPFLAGS], [`$MAGICKXX_CONFIG --cppflags`])
-AC_SUBST([MAGICK_CXXFLAGS], [`$MAGICKXX_CONFIG --cxxflags`])
-AC_SUBST([MAGICK_LDFLAGS], [`$MAGICKXX_CONFIG --ldflags`])
-AC_SUBST([MAGICK_LIBS], [`$MAGICKXX_CONFIG --libs`])
-
-
AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable extra debugging output]))
dnl Check for --enable-debug and add appropriate flags for gcc
View
@@ -66,14 +66,11 @@ EXTRA_libgamegraphics_la_SOURCES += tls-zone66.hpp
AM_CPPFLAGS = $(DEBUG_CPPFLAGS)
AM_CPPFLAGS += $(BOOST_CPPFLAGS)
-AM_CPPFLAGS += $(MAGICK_CPPFLAGS)
AM_CPPFLAGS += -I $(top_srcdir)/include
AM_CPPFLAGS += $(libgamecommon_CFLAGS)
AM_CXXFLAGS = $(DEBUG_CXXFLAGS)
-AM_CXXFLAGS += $(MAGICK_CXXFLAGS)
libgamegraphics_la_LDFLAGS = $(AM_LDFLAGS) -release @VERSION@ -version-info 0
-libgamegraphics_la_LDFLAGS += $(MAGICK_LDFLAGS)
libgamegraphics_la_LIBADD = $(BOOST_SYSTEM_LIBS)
libgamegraphics_la_LIBADD += $(MAGICK_LIBS)
libgamegraphics_la_LIBADD += $(libgamecommon_LIBS)
View
@@ -21,7 +21,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <Magick++.h>
#include "tls-hocus.hpp"
#include "tls-img.hpp"
#include "img-pcx.hpp"
View
@@ -21,7 +21,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <Magick++.h>
#include "tls-wacky.hpp"
#include "tls-img.hpp"
#include "img-pcx.hpp"
View
@@ -21,7 +21,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <Magick++.h>
#include "tls-wordresc.hpp"
#include "tls-img.hpp"
#include "img-pcx.hpp"

0 comments on commit a5fe850

Please sign in to comment.