diff --git a/core/app/utils/digikam_config.h.cmake.in b/core/app/utils/digikam_config.h.cmake.in index 82e6ea222f..c0f70ca78c 100644 --- a/core/app/utils/digikam_config.h.cmake.in +++ b/core/app/utils/digikam_config.h.cmake.in @@ -1,134 +1,134 @@ /* ============================================================ * * This file is a part of digiKam project * https://www.digikam.org * * Date : 2009-08-03 * Description : digiKam config header * * Copyright (C) 2009-2019 by Gilles Caulier * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software Foundation; * either version 2, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * ============================================================ */ #ifndef DIGIKAM_CONFIG_H #define DIGIKAM_CONFIG_H /* Define to 1 if you have KDEPIM shared library installed */ #cmakedefine HAVE_AKONADICONTACT 1 /* Define to 1 if an external liblqr-1 shared library have been found */ #cmakedefine HAVE_LIBLQR_1 1 /* Define to 1 if an external lensfun shared library have been found */ #cmakedefine HAVE_LENSFUN 1 /* Define to 1 if an external KIO shared library have been found */ #cmakedefine HAVE_KIO 1 /* Define to 1 if an external Ksane shared library have been found */ #cmakedefine HAVE_KSANE 1 /* Define to 1 if an external Marble shared library have been found */ #cmakedefine HAVE_MARBLE 1 /* Define to 1 if an external Eigen3 shared library have been found */ #cmakedefine HAVE_EIGEN3 1 /* The Eigen3 version string, if found, or an empty string otherwise */ #define EIGEN3_VERSION_STRING "${EIGEN3_VERSION}" /* Define to 1 if GPhoto2 shared library is installed */ #cmakedefine HAVE_GPHOTO2 1 /* Define to 1 if Jasper shared library is installed */ #cmakedefine HAVE_JASPER 1 /* Define to 1 if libgphoto2 2.5 shared library is installed */ #cmakedefine HAVE_GPHOTO25 1 /* Define to 1 if you have Baloo shared libraries installed */ #cmakedefine HAVE_KFILEMETADATA 1 /* Define to 1 if you have KIconThemes shared libraries installed */ #cmakedefine HAVE_KICONTHEMES 1 /* Define to 1 if you have KNotifications shared libraries installed */ #cmakedefine HAVE_KNOTIFICATIONS 1 /* Define to 1 if you have KNotifyConfig shared libraries installed */ #cmakedefine HAVE_KNOTIFYCONFIG 1 /* Define to 1 if you have KCalendar core shared libraries installed */ #cmakedefine HAVE_KCALENDAR 1 /* Define to 1 if you have KCalendar core shared libraries with QDateTime support installed */ #cmakedefine HAVE_KCALENDAR_QDATETIME 1 /* Define to 1 if Panorama tool is supported */ #cmakedefine HAVE_PANORAMA 1 /* Define to 1 if VKontakte tool is supported */ #cmakedefine HAVE_VKONTAKTE 1 /* Define to 1 if HTMLGallery tool is supported */ #cmakedefine HAVE_HTMLGALLERY 1 /* Define to 1 if we support mysql database */ #cmakedefine HAVE_MYSQLSUPPORT 1 /* Define to 1 if we support mysql internal database server */ #cmakedefine HAVE_INTERNALMYSQL 1 /* Define to 1 if preview of video files is supported */ #cmakedefine HAVE_MEDIAPLAYER 1 /* Define to 1 if DBUS is supported */ #cmakedefine HAVE_DBUS 1 /* Define to 1 if system use OpenGL */ #cmakedefine HAVE_OPENGL 1 /* Define to 1 if you want Qt to scale the preview images */ #cmakedefine USE_QT_SCALING 1 /* Define to 1 if system use X11 */ #cmakedefine HAVE_X11 1 /* Define to 1 if changing application styles is supported */ #cmakedefine HAVE_APPSTYLE_SUPPORT 1 /* Define to 1 if system use QWebEngine instead of QWebKit */ #cmakedefine HAVE_QWEBENGINE 1 /* Define to 1 if FaceEngine DNN is enabled */ -#cmakedefine HAVE_FACEENGINE_DNN 1 +#cmakedefine HAVE_FACESENGINE_DNN 1 /* Defines to 1 if the Dr. Mingw crash handler should be used */ #cmakedefine HAVE_DRMINGW 1 #define LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}" /* Disable indeep warnings from Visual Studio C++ 2008 (9.0) */ #if defined(_MSC_VER) // To disable warnings about no suitable definition provided for explicit template instantiation request. #pragma warning(disable : 4661) // To disable warnings about deprecated POSIX methods(). #pragma warning(disable : 4996) // To disable warnings about qualifier applied to reference type ignored. #pragma warning(disable : 4181) #endif #endif // DIGIKAM_CONFIG_H diff --git a/project/bundles/mxe/config.sh b/project/bundles/mxe/config.sh index ab9421194a..88ec356137 100644 --- a/project/bundles/mxe/config.sh +++ b/project/bundles/mxe/config.sh @@ -1,79 +1,79 @@ #!/bin/bash # Copyright (c) 2013-2019, Gilles Caulier, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. ######################################################################## # Absolute path where are downloaded all tarballs to compile. DOWNLOAD_DIR="`pwd`/temp.dwnld" # Absolute path where are compiled all tarballs BUILDING_DIR="`pwd`/temp.build" #------------------------------------------------------------------------------------------- # MXE configuration #------------ # IMPORTANT: Target Windows architecture to build installer. Possible values: 32 or 64 bits. -MXE_ARCHBITS=32 +MXE_ARCHBITS=64 #------------ if [[ $MXE_ARCHBITS == 32 ]]; then # Windows 32 bits shared MXE_BUILD_TARGETS="i686-w64-mingw32.shared" MXE_BUILDROOT="`pwd`/build.win32" elif [[ $MXE_ARCHBITS == 64 ]]; then # Windows 64 bits shared MXE_BUILD_TARGETS="x86_64-w64-mingw32.shared" MXE_BUILDROOT="`pwd`/build.win64" else echo "Unsupported or wrong target Windows architecture: $MXE_ARCHBITS bits." exit -1 fi echo "Target Windows architecture: $MXE_ARCHBITS bits." MXE_GIT_URL="https://github.com/mxe/mxe.git" MXE_GIT_REVISION=master MXE_INSTALL_PREFIX=${MXE_BUILDROOT}/usr/${MXE_BUILD_TARGETS}/ MXE_TOOLCHAIN=${MXE_INSTALL_PREFIX}/share/cmake/mxe-conf.cmake #------------------------------------------------------------------------------------------- # URL to git repository to checkout digiKam source code # Read/write url is an alternative when official read only server is down. #DK_GITURL="git://anongit.kde.org/digikam.git" DK_GITURL="git@git.kde.org:digikam" # digiKam tarball information. DK_URL="http://download.kde.org/stable/digikam" # Location to build source code. DK_BUILDTEMP=~/dktemp # digiKam tag version from git. Official tarball do not include extra shared libraries. # The list of tags can be listed with this url: https://quickgit.kde.org/?p=digikam.git&a=tags # If you want to package current implemntation from git, use "master" as tag. #DK_VERSION=v6.0.0 DK_VERSION=master #DK_VERSION=development/dplugins # Installer sub version to differentiates newer updates of the installer itself, even if the underlying application hasn’t changed. #DK_EPOCH="-01" # Epoch with time-stamp for pre-release bundle in ISO format DK_EPOCH="-`date "+%Y%m%dT%H%M%S"`" # Installer will include or not digiKam debug symbols DK_DEBUG=1 # Sign bundles with GPG. Passphrase must be hosted in ~/.gnupg/dkorg-gpg-pwd.txt DK_SIGN=0 # Upload automatically bundle to files.kde.org (pre-release only). DK_UPLOAD=1 DK_UPLOADURL="digikam@milonia.kde.org" DK_UPLOADDIR="/srv/archives/files/digikam/"