Skip to content

Commit

Permalink
Gtk3: generate gdk-pixbuf's loader.cache from loaders in bindist
Browse files Browse the repository at this point in the history
Point `gdk-pixbuf-query-loaders` to the win32 bindist's `lib/gdk-pixbuf-2.0/2.10.0/` directory to
generate a proper `loaders.cache` file from the pixbuf loaders we've copied into the bindist.
Might fix bug #2081. 


git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45367 379a1393-f5fb-40a0-bcee-ef074d9b53f7
  • Loading branch information
Compyx committed Nov 12, 2024
1 parent 836acf6 commit 8a92f9b
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion vice/src/arch/gtk3/make-bindist_win32.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,16 @@ done
if test x"$CROSS" != "xtrue"; then

# The following lines assume that this script is run by MSYS2.
curdir=`pwd`
cp `ntldd -R $BUILDPATH/bin/x64sc.exe|gawk '/\\\\bin\\\\/{print $3;}'|cygpath -f -` $BUILDPATH/bin
cd $MINGW_PREFIX
cp bin/lib{lzma-5,rsvg-2-2,xml2-2}.dll $BUILDPATH/bin
cp --parents lib/gdk-pixbuf-2.0/2.10.0/loaders.cache lib/gdk-pixbuf-2.0/2.10.0/loaders/*pixbufloader*{png,svg,xpm}.dll $BUILDPATH
cp --parents lib/gdk-pixbuf-2.0/2.10.0/loaders/*pixbufloader*{png,svg,xpm}.dll $BUILDPATH
# generate loaders.cache from the copied loaders in the binidst, not the system loaders
cd $BUILDPATH
GDK_PIXBUF_MODULEDIR=lib/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders > lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
cd $MINGW_PREFIX

# GTK3 accepts having only scalable icons,
# which reduces the bindist size considerably.
cp --parents -a share/icons/Adwaita/{index.*,scalable,symbolic} $BUILDPATH
Expand All @@ -154,6 +160,8 @@ if test x"$CROSS" != "xtrue"; then
cp `ntldd -R $UNZIPBIN | gawk '/\\\\bin\\\\/{print $3;}' | cygpath -f -` $BUILDPATH/bin
fi

cd "$curdir"

else

# The following lines assume a cross compiler,
Expand Down Expand Up @@ -230,6 +238,10 @@ EOF

fi


echo "TOPSRCDIR = $TOPSRCDIR"
echo "BUILDPATH = $BUILDPATH"

cp -a $TOPSRCDIR/data/C128 $TOPSRCDIR/data/C64 $BUILDPATH
cp -a $TOPSRCDIR/data/C64DTV $TOPSRCDIR/data/CBM-II $BUILDPATH
cp -a $TOPSRCDIR/data/DRIVES $TOPSRCDIR/data/PET $BUILDPATH
Expand Down

0 comments on commit 8a92f9b

Please sign in to comment.