build stuff

Author: rodlie

.travis.yml

@@ -17,11 +17,11 @@ before_install:
 script:
   - sudo chmod 777 /opt
   - mkdir -p /opt/deploy
-  - MKJOBS=2 WIN32=0 WIN64=0 QDEPTH=16 HDRI="HDRI" bash share/scripts/travis.sh
+  - MKJOBS=2 LINUX=1 APT=1 WIN32=0 WIN64=1 QDEPTH=16 HDRI="HDRI" bash share/scripts/travis.sh
   - sudo rm -rf build-*
-  - MKJOBS=2 APT=0 WIN32=0 WIN64=0 QDEPTH=32 bash share/scripts/travis.sh
+  - MKJOBS=2 LINUX=1 APT=0 WIN32=0 WIN64=0 QDEPTH=32 bash share/scripts/travis.sh
   - sudo rm -rf build-*
-  - MKJOBS=2 APT=0 WIN32=0 WIN64=0 QDEPTH=8 bash share/scripts/travis.sh
+  - MKJOBS=2 LINUX=1 APT=0 WIN32=1 WIN64=0 QDEPTH=8 bash share/scripts/travis.sh
 
 deploy:
   provider: releases

CMakeLists.txt

@@ -211,16 +211,16 @@ else()
         ${RESOURCES})
 endif()
 
-target_compile_options(${PROJECT_NAME} PRIVATE ${MAGICK_CFLAGS})
+target_compile_options(${PROJECT_NAME} PRIVATE ${MAGICK_STATIC_CFLAGS})
 target_link_libraries(
     ${PROJECT_NAME}
     Qt5::Core
     Qt5::Gui
     Qt5::Widgets
     Qt5::Concurrent
-    ${MAGICK_LIBRARIES}
+    ${MAGICK_STATIC_LIBRARIES}
     ${LCMS2_LIBRARIES}
-    ${MAGICK_LDFLAGS}
+    ${MAGICK_STATIC_LDFLAGS}
     ${LCMS2_LDFLAGS}
     ${FONTCONF_LDFLAGS}
 )

app/editor.cpp

@@ -293,7 +293,7 @@ void Editor::loadSettings()
     settings.beginGroup("engine");
     CyanCommon::setDiskResource(settings
                             .value("disk_limit", 0).toInt());
-    int maxMem = settings.value("memory_limit", 4).toInt();
+    int maxMem = settings.value("memory_limit", 2).toInt();
     CyanCommon::setMemoryResource(maxMem);
     settings.endGroup();
 

app/main.cpp

@@ -99,20 +99,19 @@ int main(int argc, char *argv[])
     QApplication::setOrganizationDomain(QString("fxarena.net"));
     QApplication::setApplicationVersion(QString(CYAN_VERSION));
 
+    QString fontconfig;
 #ifdef Q_OS_MAC
-    // setup fontconfig on mac
-    QString fontconfig = QString("%1/../Resources/etc/fonts").arg(QApplication::applicationDirPath());
-    if (QFile::exists(fontconfig)) { qputenv("FONTCONFIG_PATH", fontconfig.toUtf8()); }
+    fontconfig = QString("%1/../Resources/etc/fonts").arg(QApplication::applicationDirPath());
+#elif defined (Q_OS_WIN)
+    fontconfig = QString("%1/etc/fonts").arg(QApplication::applicationDirPath());
+#elif defined (Q_OS_LINUX)
+    fontconfig = QString("%1/../etc/fonts").arg(QApplication::applicationDirPath());
 #endif
-#ifdef Q_OS_LINUX
-    // setup fontconfig on linux
-    QString fontconfig = QString("%1/../etc/fonts").arg(QApplication::applicationDirPath());
     if (QFile::exists(fontconfig)) { qputenv("FONTCONFIG_PATH", fontconfig.toUtf8()); }
-#endif
 
 #ifndef Q_OS_LINUX
     // splash
-    QSplashScreen splash(QIcon(":/icons/splash.png").pixmap(512,512),
+    QSplashScreen splash(QIcon(":/icons/hicolor/512x512/apps/Cyan.png").pixmap(512,512),
                          Qt::SplashScreen);
     splash.show();
 #endif

share/icons.qrc

@@ -108,7 +108,6 @@
         <file>icons/hicolor/16x16/actions/process-stop.png</file>
         <file>icons/hicolor/16x16/actions/transform_move.png</file>
         <file>icons/hicolor/48x48/apps/Cyan.png</file>
-        <file>icons/splash.png</file>
         <file>icons/paypal.png</file>
         <file>icons/GitHub-Mark-Light-32px.png</file>
     </qresource>

share/icons/splash.png

@@ -15,13 +15,13 @@ DATE=`date "+%Y%m%d"`
 DISTRO=`cat /etc/os-release | sed '/UBUNTU_CODENAME/!d;s/UBUNTU_CODENAME=//'`
 WIN32=${WIN32:-0}
 WIN64=${WIN64:-0}
+LINUX=${LINUX:-1}
 HEIC="no"
 QDEPTH=${QDEPTH:-16}
 #HDRI=${HDRI:-"HDRI"}
 PATH_ORIG=$PATH
-SDK_TAR=cyan-mxe-usr-focal-20200810-1.tar.xz
+SDK_TAR=cyan-mxe-focal-20200816.tar.xz
 SDK_URL=https://github.com/rodlie/cyan/releases/download/1.2.2
-SDK_LEGAL=cyan-mxe-legal-20200810.tar.xz
 MXE=/opt/cyan-mxe
 MAGICK_RELEASE=7.0.10-27
 MAGICK_SAFE=7.0.8-34
@@ -34,6 +34,7 @@ PELF="$PKG_DIR/$PREFIX/bin/patchelf"
 LIBDEPS="dpkg-shlibdeps --ignore-missing-info"
 LIBDIR="lib/x86_64-linux-gnu"
 LD_LIBRARY_PATH_ORIG="${LD_LIBRARY_PATH}"
+VERSION=`cat ${CWD}/CMakeLists.txt | sed '/Cyan VERSION/!d;s/)//' | awk '{print $3}'`
 
 if [ "${DISTRO}" != "focal" ]; then
     WIN32=0
@@ -42,7 +43,7 @@ else
     HEIC="yes"
 fi
 
-if [ "${LOCAL_BUILD}" = 1 ]; then
+if [ "${LOCAL_BUILD}" = 1 ] || [ "${LINUX}" = 0 ]; then
     APT=0
 fi
 if [ "${APT}" = 1 ]; then
@@ -79,7 +80,7 @@ mkdir -p "${PKG_DIR}"
 if [ "${DISTRO}" = "xenial" ]; then
     MAGICK_RELEASE=$MAGICK_SAFE
 fi
-if [ ! -d ImageMagick ]; then
+if [ ! -d ImageMagick ] && [ "${LINUX}" = 1 ]; then
     git clone https://github.com/ImageMagick/ImageMagick
     ( cd ImageMagick ; git checkout $MAGICK_RELEASE )
 fi
@@ -99,6 +100,8 @@ fi
 #../patchelf/configure --prefix=${PKG_DIR}/${PREFIX}
 #make && make install
 
+if [ "${LINUX}" = 1 ]; then
+
 cd $CWD
 if [ "${CLEAN}" = 1 ]; then
     ENABLE_HDRI="disable"
@@ -171,7 +174,6 @@ export PKG_CONFIG_PATH=${PKG_DIR}/$PREFIX/lib/x86_64-linux-gnu/pkgconfig
 cd $CWD
 rm -rf build-cyan || true
 mkdir build-cyan && cd build-cyan
-VERSION=`cat ../CMakeLists.txt | sed '/Cyan VERSION/!d;s/)//' | awk '{print $3}'`
 cmake \
 -DCMAKE_BUILD_TYPE=Release \
 -DMAGICK_PKG_CONFIG=$MAGICK_TYPE \
@@ -229,6 +231,8 @@ if [ "${PKG_DEB}" = 1 ]; then
     fi
 fi
 
+fi # if LINUX=1
+
 cd $CWD
 # CROSSBUILD FOR WINDOWS
 
@@ -240,7 +244,6 @@ if [ "${WIN32}" = 1 ] || [ "${WIN64}" = 1 ]; then
         tar xf $SDK_TAR -C /opt/cyan-mxe
     fi
     cd $CWD
-    wget $SDK_URL/$SDK_LEGAL
 fi
 if [ "${WIN32}" = 1 ]; then
     MXE_TC=i686-w64-mingw32.static
@@ -254,12 +257,12 @@ if [ "${WIN32}" = 1 ]; then
     cd $CWD
     rm -rf $WIN_BUILD || true
     mkdir $WIN_BUILD && cd $WIN_BUILD
-    $CMAKE -DCMAKE_BUILD_TYPE=Release -DENABLE_FONTCONFIG=ON -DMAGICK_PKG_CONFIG=$MAGICK_TYPE -DCMAKE_INSTALL_PREFIX=/ ..
+    $CMAKE -DCMAKE_BUILD_TYPE=Release -DMAGICK_PKG_CONFIG=$MAGICK_TYPE -DCMAKE_INSTALL_PREFIX=/ ..
     make -j${MKJOBS}
     $STRIP -s Cyan.exe
     cd $CWD
     mkdir -p $WIN_PKG/platforms $WIN_PKG/profiles
-    tar xf $SDK_LEGAL -C $WIN_PKG
+    cp -a $MXE/usr/legal $WIN_PKG/
     cp $WIN_BUILD/Cyan.exe $WIN_PKG/
     cp -a $WIN_BUILD/etc $WIN_PKG/
     cp $MXE/usr/$MXE_TC/qt5/plugins/platforms/qwindows.dll $WIN_PKG/platforms/
@@ -284,12 +287,12 @@ if [ "${WIN64}" = 1 ]; then
     cd $CWD
     rm -rf $WIN_BUILD || true
     mkdir $WIN_BUILD && cd $WIN_BUILD
-    $CMAKE -DCMAKE_BUILD_TYPE=Release -DENABLE_FONTCONFIG=ON -DMAGICK_PKG_CONFIG=$MAGICK_TYPE -DCMAKE_INSTALL_PREFIX=/ ..
+    $CMAKE -DCMAKE_BUILD_TYPE=Release -DMAGICK_PKG_CONFIG=$MAGICK_TYPE -DCMAKE_INSTALL_PREFIX=/ ..
     make -j${MKJOBS}
     $STRIP -s Cyan.exe
     cd $CWD
     mkdir -p $WIN_PKG/platforms $WIN_PKG/profiles
-    tar xf $SDK_LEGAL -C $WIN_PKG
+    cp -a $MXE/usr/legal $WIN_PKG/
     cp $WIN_BUILD/Cyan.exe $WIN_PKG/
     cp -a $WIN_BUILD/etc $WIN_PKG/
     cp $MXE/usr/$MXE_TC/qt5/plugins/platforms/qwindows.dll $WIN_PKG/platforms/