diff --git a/Common/3dParty/heif/heif.pri b/Common/3dParty/heif/heif.pri index 1fd4a1940d..fcfb00a785 100644 --- a/Common/3dParty/heif/heif.pri +++ b/Common/3dParty/heif/heif.pri @@ -1,14 +1,25 @@ DEFINES += LIBHEIF_STATIC_BUILD -INCLUDEPATH += $$PWD/libheif/libheif/api + +HEIF_BUILD_PATH = $$PWD/libheif/build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX + +INCLUDEPATH += \ + $$PWD/libheif/libheif/api \ + $$HEIF_BUILD_PATH # for heif_version.h core_windows { # TODO } core_linux { - LIBS += -L$$PWD/libheif/build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX/libheif -lheif + LIBS += \ + -L$$PWD/x265_git/build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX -lx265 \ + -L$$PWD/libde265/build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX/libde265 -lde265 \ + -L$$HEIF_BUILD_PATH/libheif -lheif } core_mac { - LIBS += -L$$PWD/libheif/build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX/libheif -lheif + LIBS += \ + -L$$PWD/x265_git/build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX -lx265 \ + -L$$PWD/libde265/build/$$CORE_BUILDS_PLATFORM_PREFIX/$$CORE_BUILDS_CONFIGURATION_PREFIX/libde265 -lde265 \ + -L$$HEIF_BUILD_PATH/libheif -lheif } diff --git a/DesktopEditor/graphics/pro/raster.pri b/DesktopEditor/graphics/pro/raster.pri index 65ad871d9b..31ff5a994e 100644 --- a/DesktopEditor/graphics/pro/raster.pri +++ b/DesktopEditor/graphics/pro/raster.pri @@ -14,7 +14,7 @@ DEFINES += \ MNG_STORE_CHUNKS\ MNG_ERROR_TELLTALE -include($$CORE_ROOT_DIR/Common/3dParty/libheif/heif.pri) +include($$CORE_ROOT_DIR/Common/3dParty/heif/heif.pri) core_linux { DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H diff --git a/DesktopEditor/graphics/tests/testHeic/testHeic.pro b/DesktopEditor/graphics/tests/testHeic/testHeic.pro index 4ceb45994c..5610ac7a15 100644 --- a/DesktopEditor/graphics/tests/testHeic/testHeic.pro +++ b/DesktopEditor/graphics/tests/testHeic/testHeic.pro @@ -1,9 +1,10 @@ QT -= core - QT -= gui -TARGET = test +TARGET = test CONFIG += console +CONFIG -= app_bundle + TEMPLATE = app CORE_ROOT_DIR = $$PWD/../../../..