Skip to content

Commit 278d53e

Browse files
committed
Add missing bits for win32 packaging
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 2112414 commit 278d53e

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,13 @@ jobs:
118118
shell: bash
119119
run: |
120120
source PawPaw/local.env win32
121-
mkdir Chibi-win32
121+
mkdir -p Chibi-win32/{imageformats,iconengines,platforms,styles}
122122
mv build/*.exe build/carla/cmake/carla-discovery-*.exe build/carla/cmake/*.dll Chibi-win32/
123-
cp ${PAWPAW_PREFIX}/bin/Qt5{Core,Gui,Widgets}.dll Chibi-win32/
123+
cp ${PAWPAW_PREFIX}/bin/Qt5{Core,Gui,Svg,Widgets}.dll Chibi-win32/
124+
cp ${PAWPAW_PREFIX}/lib/qt5/plugins/imageformats/qsvg.dll Chibi-win32/imageformats/
125+
cp ${PAWPAW_PREFIX}/lib/qt5/plugins/iconengines/qsvgicon.dll Chibi-win32/iconengines/
126+
cp ${PAWPAW_PREFIX}/lib/qt5/plugins/platforms/qwindows.dll Chibi-win32/platforms/
127+
cp ${PAWPAW_PREFIX}/lib/qt5/plugins/styles/qwindowsvistastyle.dll Chibi-win32/styles/
124128
zip -r -9 Chibi-win32.zip Chibi-win32
125129
- uses: actions/upload-artifact@v3
126130
with:
@@ -194,9 +198,13 @@ jobs:
194198
shell: bash
195199
run: |
196200
source PawPaw/local.env win64
197-
mkdir Chibi-win64
201+
mkdir -p Chibi-win64/{imageformats,iconengines,platforms,styles}
198202
mv build/*.exe build/carla/cmake/carla-discovery-*.exe build/carla/cmake/*.dll Chibi-win64/
199-
cp ${PAWPAW_PREFIX}/bin/Qt5{Core,Gui,Widgets}.dll Chibi-win64/
203+
cp ${PAWPAW_PREFIX}/bin/Qt5{Core,Gui,Svg,Widgets}.dll Chibi-win64/
204+
cp ${PAWPAW_PREFIX}/lib/qt5/plugins/imageformats/qsvg.dll Chibi-win64/imageformats/
205+
cp ${PAWPAW_PREFIX}/lib/qt5/plugins/iconengines/qsvgicon.dll Chibi-win64/iconengines/
206+
cp ${PAWPAW_PREFIX}/lib/qt5/plugins/platforms/qwindows.dll Chibi-win64/platforms/
207+
cp ${PAWPAW_PREFIX}/lib/qt5/plugins/styles/qwindowsvistastyle.dll Chibi-win64/styles/
200208
zip -r -9 Chibi-win64.zip Chibi-win64
201209
- uses: actions/upload-artifact@v3
202210
with:

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ target_sources(Chibi
7474
carla/source/frontend/carla_frontend.cpp
7575
carla/source/frontend/pluginlist/pluginlistdialog.cpp
7676
carla/source/frontend/pluginlist/pluginrefreshdialog.hpp
77+
carla/resources/resources.qrc
7778
)
7879

7980
set_target_properties(Chibi

main.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ int main(int argc, char *argv[])
3131
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
3232
QApplication::setAttribute(Qt::AA_X11InitThreads);
3333

34+
#ifdef CARLA_OS_WIN
35+
QApplication::addLibraryPath(QString::fromUtf8(carla_get_library_folder()));
36+
#endif
37+
3438
QApplication app(argc, argv);
3539
app.setApplicationName("Chibi");
3640
app.setApplicationVersion(CARLA_VERSION_STRING);

0 commit comments

Comments
 (0)