mirror of https://github.com/mgba-emu/mgba.git
Feature: Support ImageMagick 7
This commit is contained in:
parent
8dde1b5654
commit
2e3daaedc2
1
CHANGES
1
CHANGES
|
@ -47,6 +47,7 @@ Misc:
|
||||||
- GB Audio: Start implementing "zombie" audio (fixes mgba.io/i/389)
|
- GB Audio: Start implementing "zombie" audio (fixes mgba.io/i/389)
|
||||||
- VFS: Fix some minor VFile issues with FILEs
|
- VFS: Fix some minor VFile issues with FILEs
|
||||||
- Core: Add generic checksum function
|
- Core: Add generic checksum function
|
||||||
|
- Feature: Support ImageMagick 7
|
||||||
|
|
||||||
0.5.2: (2016-12-31)
|
0.5.2: (2016-12-31)
|
||||||
Bugfixes:
|
Bugfixes:
|
||||||
|
|
|
@ -322,6 +322,7 @@ if(HAVE_UMASK)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Feature dependencies
|
# Feature dependencies
|
||||||
|
set(FEATURE_DEFINES)
|
||||||
set(FEATURES)
|
set(FEATURES)
|
||||||
if(CMAKE_SYSTEM_NAME MATCHES .*BSD)
|
if(CMAKE_SYSTEM_NAME MATCHES .*BSD)
|
||||||
set(LIBEDIT_LIBRARIES -ledit)
|
set(LIBEDIT_LIBRARIES -ledit)
|
||||||
|
@ -431,11 +432,16 @@ if(USE_MAGICK)
|
||||||
list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/imagemagick/imagemagick-gif-encoder.c")
|
list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/imagemagick/imagemagick-gif-encoder.c")
|
||||||
list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES})
|
list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES})
|
||||||
string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION})
|
string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION})
|
||||||
|
string(REGEX MATCH "^[0-9]+" MAGICKWAND_VERSION_MAJOR ${MagickWand_VERSION})
|
||||||
if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7")
|
if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7")
|
||||||
set(MAGICKWAND_DEB_VERSION "5")
|
set(MAGICKWAND_DEB_VERSION "5")
|
||||||
|
elseif(${MagickWand_VERSION} EQUAL "6.9.7")
|
||||||
|
set(MAGICKWAND_DEB_VERSION "-6.q16-3")
|
||||||
else()
|
else()
|
||||||
set(MAGICKWAND_DEB_VERSION "-6.q16-2")
|
set(MAGICKWAND_DEB_VERSION "-6.q16-2")
|
||||||
endif()
|
endif()
|
||||||
|
list(APPEND FEATURE_DEFINES MAGICKWAND_VERSION_MAJOR=${MAGICKWAND_VERSION_MAJOR})
|
||||||
|
|
||||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libmagickwand${MAGICKWAND_DEB_VERSION}")
|
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libmagickwand${MAGICKWAND_DEB_VERSION}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -595,7 +601,6 @@ if(USE_DEBUGGERS)
|
||||||
list(APPEND FEATURES DEBUGGERS)
|
list(APPEND FEATURES DEBUGGERS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(FEATURE_DEFINES)
|
|
||||||
foreach(FEATURE IN LISTS FEATURES)
|
foreach(FEATURE IN LISTS FEATURES)
|
||||||
list(APPEND FEATURE_DEFINES "USE_${FEATURE}")
|
list(APPEND FEATURE_DEFINES "USE_${FEATURE}")
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
|
@ -15,7 +15,11 @@ CXX_GUARD_START
|
||||||
#define MAGICKCORE_HDRI_ENABLE 0
|
#define MAGICKCORE_HDRI_ENABLE 0
|
||||||
#define MAGICKCORE_QUANTUM_DEPTH 8
|
#define MAGICKCORE_QUANTUM_DEPTH 8
|
||||||
|
|
||||||
|
#if MAGICKWAND_VERSION_MAJOR >= 7
|
||||||
|
#include <MagickWand/MagickWand.h>
|
||||||
|
#else
|
||||||
#include <wand/MagickWand.h>
|
#include <wand/MagickWand.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
struct ImageMagickGIFEncoder {
|
struct ImageMagickGIFEncoder {
|
||||||
struct mAVStream d;
|
struct mAVStream d;
|
||||||
|
|
Loading…
Reference in New Issue