Skip to content

Commit 12ae597

Browse files
committed
progress on windows
1 parent bbd46f6 commit 12ae597

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed
File renamed without changes.

meson.build

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ executable(
5959
dependency('gee-0.8'),
6060
dependency('gtk4')
6161
],
62+
# win_subsystem: 'windows',
6263
install : true
6364
)
64-
65+
# ,
66+
# win_subsystem: 'windows',
6567

6668
#================================
6769

@@ -72,6 +74,5 @@ subdir('po')
7274

7375
gnome.post_install(
7476
glib_compile_schemas: true,
75-
gtk_update_icon_cache: true,
76-
update_desktop_database: true,
77-
)
77+
gtk_update_icon_cache: true
78+
)

windows/deploy.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ deploy_dir="windows/deploy"
1212
exe_name="io.github.ellie_commons.jorts.exe"
1313
icon_file="windows/jorts.ico"
1414
icon_file_install="windows/jorts.ico"
15-
icon_file_uninstall="windows/jorts.ico"
15+
icon_file_uninstall="jorts.ico"
1616

1717
#PRE MESON
18-
#Skip refresh package
18+
#Add win subsystem gui
1919
#Skip metainfo
2020

2121
# Rebuild the exe as a release build
@@ -24,7 +24,7 @@ meson setup --buildtype release ${build_dir}
2424
ninja -C ${build_dir}
2525

2626
#POST MESON
27-
#re-add refresh package
27+
#remove win subsystem gui
2828
#re-add metainfo
2929

3030
# Copy DLLS
@@ -53,14 +53,19 @@ cp -r ${font_path} ${deploy_dir}/etc/fonts/${font_path}
5353

5454
mkdir -p ${deploy_dir}/lib/gdk-pixbuf-2.0/2.10.0
5555
cp -r /mingw64/lib/gdk-pixbuf-2.0/2.10.0 ${deploy_dir}/lib/gdk-pixbuf-2.0
56-
cp -r share ${deploy_dir}
56+
57+
# Fix for icons being broken THIS IS SO STUPID WHY
58+
cp -r ${deploy_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders/pixbufloader_svg.dll ${deploy_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader_svg.dll
59+
gdk-pixbuf-query-loaders.exe --update-cache ${deploy_dir}/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader_svg.dll
60+
61+
cp -r /mingw64/share ${deploy_dir}
5762
cp -r /mingw64/share/glib-2.0 ${deploy_dir}/share/
5863
cp -r /mingw64/share/gtk-3.0 ${deploy_dir}/share/
5964
cp -r /mingw64/share/gtk-4.0 ${deploy_dir}/share/
6065
cp -r /mingw64/share/icons ${deploy_dir}/share/
6166
cp -r /mingw64/share/icu ${deploy_dir}/share/
6267
cp -r /mingw64/share/locale ${deploy_dir}/share/
63-
cp -r /mingw64/share/themes/${theme_name} ${deploy_dir}/share/
68+
cp -r /mingw64/share/themes/${theme_name} ${deploy_dir}/share/themes
6469

6570
# Write the theme to gtk settings
6671
cat << EOF > ${deploy_dir}/etc/gtk-4.0/settings.ini

0 commit comments

Comments
 (0)