Merge branch 'master' of https://github.com/mfeemster/fractorium.git

Builds/QtCreator/Fractorium/Fractorium.pro

@@ -16,8 +16,6 @@ PRJ_DIR = $$SRC_DIR/Fractorium
 target.path = $$BIN_INSTALL_DIR
 INSTALLS += target
 
-# FIXME: flam3-palettes.xml does not install when installing from .deb, but `make install` works.
-
 palettes.path = $$SHARE_INSTALL_DIR
 palettes.files = $$ASSETS_DIR/flam3-palettes.xml
 INSTALLS += palettes
@@ -26,6 +24,14 @@ themes.path = $$SHARE_INSTALL_DIR
 themes.files = $$ASSETS_DIR/dark.qss
 INSTALLS += themes
 
+icon.path = $$SHARE_INSTALL_DIR
+icon.files = $$PRJ_DIR/Icons/Fractorium.png
+INSTALLS += icon
+
+launcher.path = $$LAUNCHER_INSTALL_DIR
+launcher.files = $$ASSETS_DIR/Fractorium.desktop
+INSTALLS += launcher
+
 macx:ICON = $$ASSETS_DIR/Fractorium.icns
 
 LIBS += -L$$absolute_path($$DESTDIR) -lEmber

Builds/QtCreator/defaults.pri

@@ -8,6 +8,7 @@ unix|macx {
   LIB_INSTALL_DIR = /usr/lib
   BIN_INSTALL_DIR = /usr/bin
   SHARE_INSTALL_DIR = /usr/share/fractorium
+  LAUNCHER_INSTALL_DIR = /usr/share/applications
 }
 
 # When loaded by QtCreator

Builds/create-symlinks.sh

@@ -23,14 +23,28 @@ if [[ ! -e $linkpath && -e $targetpath ]]; then
     ln -s "$targetpath" "$linkpath"
 fi
 
-targetpath=$(ls -d1 /usr/include/*/GL | head -n 1)
+targetpath=""
+
+if [ -d /usr/include/*/GL ]; then
+    targetpath=$(ls -d1 /usr/include/*/GL | head -n 1)
+elif [ -d /usr/include/GL ]; then
+    targetpath="/usr/include/GL"
+fi
+
 linkpath="$LOCAL_INCLUDE_DIR/GL"
 
 if [[ ! -e $linkpath && -e $targetpath ]]; then
     ln -s "$targetpath" "$linkpath"
 fi
 
-targetpath=$(ls -d1 /usr/include/*/CL | head -n 1)
+targetpath=""
+
+if [ -d /usr/include/*/CL ]; then
+    targetpath=$(ls -d1 /usr/include/*/CL | head -n 1)
+elif [ -d /usr/include/CL ]; then
+    targetpath="/usr/include/CL"
+fi
+
 linkpath="$LOCAL_INCLUDE_DIR/CL"
 
 if [[ ! -e $linkpath && -e $targetpath ]]; then