Fix: CMake build fixes + Uikit moc header fix

.github/workflows/main.yml

@@ -19,6 +19,7 @@ env:
   QTCREATOR_VERSION: 11.0.3
   VERSION: 2024.3
   THUNDER_RELEASE: ${{ startsWith(github.ref, 'refs/tags/2') }}
+  BSD_VERSION: 14.1
 
 jobs:
   version:
@@ -249,10 +250,52 @@ jobs:
         name: ThunderEngine-windows-x64.7z
         path: ThunderEngine-windows-x64.7z
 
+  freebsd:
+    name: FreeBSD
+    runs-on: ubuntu-latest
+    needs: version
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+        repository: 'bedwardly-down/thunder-bsd'
+        path: 'thunder'
+        ref: 'fix-moc-freebsd'
+
+    - name: Build Thunder
+      uses: vmactions/freebsd-vm@v1
+      with:
+        release: "${{ env.BSD_VERSION }}"
+        usesh: true
+        sync: rsync
+        prepare: |
+          pkg install -y llvm17 libinotify openal-soft xorg 7-zip cmake ninja pkgconf
+          pkg install -y qt5-widgets qt5-core qt5-gamepad qt5-gui qt5-svg qt5-xml qmake qt5 
+        run: |
+          mkdir -pv thunder-build
+          cd thunder-build
+          CC=clang17 CXX=clang++17 cmake ../thunder -G "Ninja"
+          ninja
+          ninja install
+          mkdir -pv release
+          mv -v install-root release
+          7z a -t7z ../ThunderEngine-freebsd-x64.7z release/install-root
+          cd ..
+          mv -v thunder /tmp
+          mv -v thunder-build /tmp
+
+    - name: Upload Thunder
+      uses: actions/upload-artifact@v2
+      with:
+          name: ThunderEngine-freebsd-x64.7z
+          path: ThunderEngine-freebsd-x64.7z
+
   github:
     name: Upload to GitHub releases
     runs-on: ubuntu-latest
-    needs: [version, linux, windows, android, ios, tvos]
+    needs: [version, linux, windows, android, ios, tvos, freebsd]
 
     if: github.repository == 'thunder-engine/thunder' && needs.version.outputs.release == 'true'
 
@@ -299,6 +342,12 @@ jobs:
         with:
           name: ThunderEngine-android.7z
 
+      - name: Download FreeBSD binaries
+        id: download-freebsd
+        uses: actions/download-artifact@v2
+        with:
+          name: ThunderEngine-freebsd-x64.7z
+
       - name: Upload Windows
         uses: actions/upload-release-asset@v1
         with:
@@ -337,4 +386,12 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ThunderEngine-android.7z
           asset_name: ThunderEngine-android.7z
-          asset_content_type: application/x-7z-compressed
+          asset_content_type: application/x-7z-compressed
+
+      - name: Upload FreeBSD
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ThunderEngine-freebsd-x64.7z
+          asset_name: ThunderEngine-freebsd-x64.7z
+          asset_content_type: application/x-7z-compressed

modules/editor/grapheditor/CMakeLists.txt

@@ -35,15 +35,11 @@ file(GLOB MOC_HEADERS
     "editor/graph/graphwidgets/*.h"
 )
 
-set(RESOURCES
-    grapheditor.qrc
-)
-
 QT5_ADD_RESOURCES(RES_SOURCES ${RESOURCES})
 QT5_WRAP_CPP(MOC_SRCS ${MOC_HEADERS})
 
 if (desktop)
-    add_library(${PROJECT_NAME}-editor SHARED ${${PROJECT_NAME}_srcFiles} ${MOC_SRCS} ${RES_SOURCES})
+    add_library(${PROJECT_NAME}-editor SHARED ${${PROJECT_NAME}_srcFiles} ${MOC_SRCS})
 
     target_link_libraries(${PROJECT_NAME}-editor PRIVATE
         next-editor

modules/uikit/CMakeLists.txt

@@ -8,7 +8,9 @@ project(uikit)
 file(GLOB ${PROJECT_NAME}_srcFiles
     "src/*.cpp"
     "src/components/*.cpp"
+    "src/converters/*.cpp"
     "src/editor/*.cpp"
+    "src/editor/tools/*.cpp"
     "src/pipelinetasks/*.cpp"
     "src/resources/*.cpp"
     "src/utils/*.cpp"
@@ -69,15 +71,10 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${${PROJECT_NAME}_srcFiles})
 # Dynamic Library
 if (desktop)
     add_library(${PROJECT_NAME}-editor SHARED
-        ${${PROJECT_NAME}_srcFiles}
         ${MOC_SRCS}
         ${UI_HEADERS}
         ${RES_SOURCES}
-        "src/converters/stylesheetconverter.cpp"
-        "src/converters/uiconverter.cpp"
-        "src/editor/uiedit.cpp"
-        "src/editor/widgetcontroller.cpp"
-        "src/editor/tools/widgettool.cpp"
+        ${${PROJECT_NAME}_srcFiles}
     )
 
     target_link_libraries(${PROJECT_NAME}-editor PRIVATE