Author: cazfi Date: Sat Feb 11 08:32:07 2017 New Revision: 35004 URL: http://svn.gna.org/viewcvs/freeciv?rev=35004&view=rev Log: Add dlls needed by gtk3.22-client and sdl2-client to cross-built windows installers.
See gna patch #8106 Modified: branches/S3_0/windows/installer_cross/installer_build.sh Modified: branches/S3_0/windows/installer_cross/installer_build.sh URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/windows/installer_cross/installer_build.sh?rev=35004&r1=35003&r2=35004&view=diff ============================================================================== --- branches/S3_0/windows/installer_cross/installer_build.sh (original) +++ branches/S3_0/windows/installer_cross/installer_build.sh Sat Feb 11 08:32:07 2017 @@ -1,4 +1,68 @@ #!/bin/bash + +add_gtk3_env() { + mkdir -p $2/etc && + cp -R $1/etc/gtk-3.0 $2/etc/ && + mkdir -p $2/lib && + cp -R $1/lib/gdk-pixbuf-2.0 $2/lib/ && + mkdir -p $2/share/icons && + cp -R $1/share/locale $2/share/ && + cp -R $1/share/icons/Adwaita $2/share/icons/ && + cp $1/bin/libgtk-3-0.dll $2/ && + cp $1/bin/libgdk-3-0.dll $2/ && + cp $1/bin/libglib-2.0-0.dll $2/ && + cp $1/bin/libgobject-2.0-0.dll $2/ && + cp $1/bin/libpixman-1-0.dll $2/ && + cp $1/bin/libcairo-gobject-2.dll $2/ && + cp $1/bin/libcairo-2.dll $2/ && + cp $1/bin/libepoxy-0.dll $2/ && + cp $1/bin/libgdk_pixbuf-2.0-0.dll $2/ && + cp $1/bin/libgio-2.0-0.dll $2/ && + cp $1/bin/libpango-1.0-0.dll $2/ && + cp $1/bin/libpangocairo-1.0-0.dll $2/ && + cp $1/bin/libpcre-1.dll $2/ && + cp $1/bin/libffi-6.dll $2/ && + cp $1/bin/libatk-1.0-0.dll $2/ && + cp $1/bin/libgmodule-2.0-0.dll $2/ && + cp $1/bin/libpangowin32-1.0-0.dll $2/ && + cp $1/bin/libfontconfig-1.dll $2/ && + cp $1/bin/libfreetype-6.dll $2/ && + cp $1/bin/libpng16-16.dll $2/ && + cp $1/bin/libpangoft2-1.0-0.dll $2/ && + cp $1/bin/libxml2-2.dll $2/ && + cp $1/bin/libharfbuzz-0.dll $2/ +} + +add_sdl2_mixer_env() { + cp $1/bin/SDL2.dll $2/ && + cp $1/bin/SDL2_mixer.dll $2/ && + cp $1/bin/libvorbisfile-3.dll $2/ && + cp $1/bin/libvorbis-0.dll $2/ && + cp $1/bin/libogg-0.dll $2/ +} + +add_sdl2_env() { + cp $1/bin/SDL2_image.dll $2/ && + cp $1/bin/SDL2_ttf.dll $2/ && + cp $1/bin/libtiff-5.dll $2/ && + cp $1/bin/libjpeg-9.dll $2/ +} + +add_qt_env() { + cp $1/bin/Qt5Core.dll $2/ && + cp $1/bin/Qt5Gui.dll $2/ +} + +add_common_env() { + cp $1/bin/libcurl-4.dll $2/ && + cp $1/bin/liblzma-5.dll $2/ && + cp $1/bin/libintl-8.dll $2/ && + cp $1/bin/libsqlite3-0.dll $2/ && + cp $1/bin/libiconv-2.dll $2/ && + cp $1/bin/libz.dll.1.2.8 $2/ && + cp $1/lib/icuuc58.dll $2/ && + cp $1/lib/icudt58.dll $2/ +} if test "x$1" = x || test "x$1" = "x-h" || test "x$1" = "x--help" || test "x$2" = "x" ; then echo "Usage: $0 <crosser dir> <gui>" @@ -59,8 +123,18 @@ rm -Rf $INSTDIR/lib cp Freeciv.url $INSTDIR/ +if ! add_common_env $DLLSPATH $INSTDIR ; then + echo "Copying common environment failed!" >&2 + exit 1 +fi + if test "x$GUI" = "xruledit" ; then cp freeciv-ruledit.cmd $INSTDIR/ + + if ! add_qt_env $DLLSPATH $INSTDIR ; then + echo "Copying Qt environment failed!" >&2 + exit 1 + fi if ! ./create-freeciv-ruledit-nsi.sh $INSTDIR $VERREV $SETUP > Freeciv-ruledit-$SETUP-$VERREV.nsi then @@ -71,6 +145,31 @@ makensis Freeciv-ruledit-$SETUP-$VERREV.nsi else cp freeciv-server.cmd freeciv-$GUI.cmd freeciv-mp-$FCMP.cmd $INSTDIR/ + + if ! add_sdl2_mixer_env $DLLSPATH $INSTDIR ; then + echo "Copying SDL2_mixer environment failed!" >&2 + exit 1 + fi + + if test "x$GUI" != "xqt" ; then + if ! add_gtk3_env $DLLSPATH $INSTDIR ; then + echo "Copying gtk3 environment failed!" >&2 + exit 1 + fi + fi + + case $GUI in + sdl2) + if ! add_sdl2_env $DLLSPATH $INSTDIR ; then + echo "Copying SDL2 environment failed!" >&2 + exit 1 + fi ;; + qt) + if ! add_qt_env $DLLSPATH $INSTDIR ; then + echo "Copying Qt environment failed!" >&2 + exit 1 + fi ;; + esac if test "x$GUI" = "xsdl2" ; then if ! ./create-freeciv-sdl2-nsi.sh $INSTDIR $VERREV $SETUP > Freeciv-$SETUP-$VERREV-$GUI.nsi _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits