Add missing bits for win32 packaging

Signed-off-by: falkTX <falktx@falktx.com>
falkTX · Jun 5, 2023 · 278d53e · 278d53e
1 parent 2112414
commit 278d53e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -118,9 +118,13 @@ jobs:
         shell: bash
         run: |
           source PawPaw/local.env win32
-          mkdir Chibi-win32
+          mkdir -p Chibi-win32/{imageformats,iconengines,platforms,styles}
           mv build/*.exe build/carla/cmake/carla-discovery-*.exe build/carla/cmake/*.dll Chibi-win32/
-          cp ${PAWPAW_PREFIX}/bin/Qt5{Core,Gui,Widgets}.dll Chibi-win32/
+          cp ${PAWPAW_PREFIX}/bin/Qt5{Core,Gui,Svg,Widgets}.dll Chibi-win32/
+          cp ${PAWPAW_PREFIX}/lib/qt5/plugins/imageformats/qsvg.dll Chibi-win32/imageformats/
+          cp ${PAWPAW_PREFIX}/lib/qt5/plugins/iconengines/qsvgicon.dll Chibi-win32/iconengines/
+          cp ${PAWPAW_PREFIX}/lib/qt5/plugins/platforms/qwindows.dll Chibi-win32/platforms/
+          cp ${PAWPAW_PREFIX}/lib/qt5/plugins/styles/qwindowsvistastyle.dll Chibi-win32/styles/
           zip -r -9 Chibi-win32.zip Chibi-win32
       - uses: actions/upload-artifact@v3
         with:
@@ -194,9 +198,13 @@ jobs:
         shell: bash
         run: |
           source PawPaw/local.env win64
-          mkdir Chibi-win64
+          mkdir -p Chibi-win64/{imageformats,iconengines,platforms,styles}
           mv build/*.exe build/carla/cmake/carla-discovery-*.exe build/carla/cmake/*.dll Chibi-win64/
-          cp ${PAWPAW_PREFIX}/bin/Qt5{Core,Gui,Widgets}.dll Chibi-win64/
+          cp ${PAWPAW_PREFIX}/bin/Qt5{Core,Gui,Svg,Widgets}.dll Chibi-win64/
+          cp ${PAWPAW_PREFIX}/lib/qt5/plugins/imageformats/qsvg.dll Chibi-win64/imageformats/
+          cp ${PAWPAW_PREFIX}/lib/qt5/plugins/iconengines/qsvgicon.dll Chibi-win64/iconengines/
+          cp ${PAWPAW_PREFIX}/lib/qt5/plugins/platforms/qwindows.dll Chibi-win64/platforms/
+          cp ${PAWPAW_PREFIX}/lib/qt5/plugins/styles/qwindowsvistastyle.dll Chibi-win64/styles/
           zip -r -9 Chibi-win64.zip Chibi-win64
       - uses: actions/upload-artifact@v3
         with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,6 +74,7 @@ target_sources(Chibi
     carla/source/frontend/carla_frontend.cpp
     carla/source/frontend/pluginlist/pluginlistdialog.cpp
     carla/source/frontend/pluginlist/pluginrefreshdialog.hpp
+    carla/resources/resources.qrc
 )
 
 set_target_properties(Chibi

diff --git a/main.cpp b/main.cpp
@@ -31,6 +31,10 @@ int main(int argc, char *argv[])
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
     QApplication::setAttribute(Qt::AA_X11InitThreads);
 
+   #ifdef CARLA_OS_WIN
+    QApplication::addLibraryPath(QString::fromUtf8(carla_get_library_folder()));
+   #endif
+
     QApplication app(argc, argv);
     app.setApplicationName("Chibi");
     app.setApplicationVersion(CARLA_VERSION_STRING);