all repos — mgba @ 909d1146a16b8fbd7986dd91c0d4db76b932ab57

mGBA Game Boy Advance Emulator

ImageMagick: Fix predefinitions issue
Vicki Pfau vi@endrift.com
Thu, 20 Sep 2018 12:50:01 -0700
commit

909d1146a16b8fbd7986dd91c0d4db76b932ab57

parent

5d8e77d96721aff70ae934d18865aba83abc7a2f

2 files changed, 1 insertions(+), 4 deletions(-)

jump to
M src/feature/imagemagick/imagemagick-gif-encoder.hsrc/feature/imagemagick/imagemagick-gif-encoder.h

@@ -12,9 +12,6 @@ CXX_GUARD_START

#include <mgba/core/interface.h> -#define MAGICKCORE_HDRI_ENABLE 0 -#define MAGICKCORE_QUANTUM_DEPTH 8 - #if MAGICKWAND_VERSION_MAJOR >= 7 #include <MagickWand/MagickWand.h> #else
M src/platform/qt/CMakeLists.txtsrc/platform/qt/CMakeLists.txt

@@ -269,7 +269,7 @@

qt5_wrap_ui(UI_SRC ${UI_FILES}) add_executable(${BINARY_NAME}-qt WIN32 MACOSX_BUNDLE main.cpp ${CMAKE_SOURCE_DIR}/res/mgba.icns ${SOURCE_FILES} ${PLATFORM_SRC} ${UI_SRC} ${AUDIO_SRC} ${RESOURCES}) -set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in COMPILE_DEFINITIONS "${FEATURE_DEFINES};${FUNCTION_DEFINES};${OS_DEFINES};${QT_DEFINES}") +set_target_properties(${BINARY_NAME}-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/info.plist.in COMPILE_DEFINITIONS "${FEATURE_DEFINES};${FUNCTION_DEFINES};${OS_DEFINES};${QT_DEFINES}" COMPILE_OPTIONS "${FEATURE_FLAGS}") list(APPEND QT_LIBRARIES Qt5::Widgets) if(BUILD_GL OR BUILD_GLES2)