Flatpak almost working. No desktop integration yet.

.gitignore

@@ -1,4 +1,5 @@
 .idea/
+.flatpak-builder/
 crapForLater/
 thirdparty/scintilla/
 thirdparty/lexilla/

CMakeLists.txt

@@ -78,9 +78,6 @@ add_definitions(
 	${GTK3_CFLAGS}
 )
 
-#set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES LINK_SEARCH_START_STATIC ON)
-#set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES LINK_SEARCH_END_STATIC ON)
-#target_link_options(${CMAKE_PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++ -static)
 
 target_link_libraries(${CMAKE_PROJECT_NAME}
 	-rdynamic
@@ -91,4 +88,5 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
 	-lstdc++
 )
 
-#target_link_options(${CMAKE_PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++)
+
+install(TARGETS ${CMAKE_PROJECT_NAME})

buildFlatpak.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
-flatpak install --user flathub org.gnome.Platform//3.26 org.gnome.Sdk//3.26
+flatpak install flathub org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08
 
-flatpak-builder flatpak-build flatpak.yaml
+[[ -d .flatpak-builder ]] && rm -rf .flatpak-builder
+[[ -d flatpak-build ]] && rm -rf flatpak-build
+
+flatpak-builder -v --user --install flatpak-build com.kangaroopunch.JoeyDev.yaml

com.kangaroopunch.JoeyDev.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=0.1
+Type=Application
+Name=JoeyDev
+Comment=A Development Tool for JoeyLib
+Categories=Programming;
+Exec=joeydev
+Terminal=false
+Icon=com.kangaroopunch.JoeyDev

com.kangaroopunch.JoeyDev.yaml

@@ -0,0 +1,50 @@
+app-id: com.kangaroopunch.JoeyDev
+
+runtime: org.freedesktop.Platform
+runtime-version: '22.08'
+sdk: org.freedesktop.Sdk
+
+command: joeydev
+
+modules:
+  - name: joeydev
+    buildsystem: cmake-ninja
+    sources:
+      - type: dir
+        path: include
+        dest: include
+      - type: dir
+        path: src
+        dest: src
+      - type: dir
+        path: thirdparty
+        dest: thirdparty
+      - type: dir
+        path: ui
+        dest: ui
+      - type: dir
+        path: tools
+        dest: tools
+      - type: file
+        path: buildDeps.sh
+      - type: file
+        path: CMakeLists.txt
+
+  - name: desktop
+    buildsystem: simple
+    build-commands:
+      - install -Dm755 com.kangaroopunch.JoeyDev.desktop -t /app/share/applications
+      - install -Dm644 icon.png /app/share/icons/hicolor/128x128/com.kangaroopunch.JoeyDev.png
+    sources:
+      - type: file
+        path: com.kangaroopunch.JoeyDev.desktop
+      - type: file
+        path: icon.png
+
+finish-args:
+  - --share=ipc
+  - --socket=fallback-x11
+  - --socket=wayland
+  - --filesystem=host
+  - --share=network
+  - --device=dri

flatpak.yaml

@@ -1,31 +0,0 @@
-app-id: com.kangaroopunch.JoeyDev
-runtime: org.gnome.Platform
-runtime-version: '3.26'
-sdk: org.gnome.Sdk
-command: joeydev
-modules:
-  - name: joeydev
-    buildsystem: cmake-ninja
-    #config-opts:
-    sources:
-      - type: dir
-        path: include
-      - type: dir
-        path: src
-      - type: dir
-        path: thirdparty
-      - type: dir
-        path: ui
-      - type: dir
-        path: tools
-      - type: file
-        path: buildDeps.sh
-      - type: file
-        path: CMakeLists.txt
-finish-args:
-  - --share=ipc
-  - --socket=fallback-x11
-  - --socket=wayland
-  - --filesystem=host
-  - --share=network
-  - --device=dri