diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2015-11-30 12:07:01 +0100 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-12-01 16:46:07 +0100 |
| commit | 15c97c42a16c3ed127bd99339783f16b7cdfbbe2 (patch) | |
| tree | 1ba1aa603ec19179c3f6a5bbe6c54b2275131c64 | |
| parent | f345d27724632543f8ff5255a80e1ff040885a94 (diff) | |
| download | virt-viewer-15c97c42a16c3ed127bd99339783f16b7cdfbbe2.tar.gz virt-viewer-15c97c42a16c3ed127bd99339783f16b7cdfbbe2.tar.xz virt-viewer-15c97c42a16c3ed127bd99339783f16b7cdfbbe2.zip | |
autobuild: gtk2 has been dropped for windows
0a7fa73f is the commit that dropped support for gtk2 for the nsis
installer.
03c014cb is the commit that dropped support for gtk2 for the msi
installer.
| -rwxr-xr-x | autobuild.sh | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/autobuild.sh b/autobuild.sh index 164bdaf..f63c635 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -80,26 +80,10 @@ if [ -x /usr/bin/i686-w64-mingw32-gcc ]; then --build=$(uname -m)-w64-linux \ --host=i686-w64-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ - --with-gtk=2.0 + --with-gtk=3.0 make make install - - # Test GTK3 build too if available - PKG_CONFIG_LIBDIR=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig pkg-config gtk+-3.0 1>/dev/null 2>&1 - if test $? = 0 ; then - make distclean - PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig" \ - PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ - CC="i686-w64-mingw32-gcc" \ - ../configure --prefix=$AUTOBUILD_INSTALL_ROOT \ - --build=$(uname -m)-w64-linux \ - --host=i686-w64-mingw32 \ - --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ - --with-gtk=3.0 - make - make install - fi fi @@ -113,26 +97,10 @@ if [ -x /usr/bin/x86_64-w64-mingw32-gcc ]; then --build=$(uname -m)-w64-linux \ --host=x86_64-w64-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \ - --with-gtk=2.0 + --with-gtk=3.0 make make install - - # Test GTK3 build too if available - PKG_CONFIG_LIBDIR=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig pkg-config gtk+-3.0 1>/dev/null 2>&1 - if test $? = 0 ; then - make distclean - PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig" \ - PKG_CONFIG_PATH="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig" \ - CC="x86_64-w64-mingw32-gcc" \ - ../configure --prefix=$AUTOBUILD_INSTALL_ROOT \ - --build=$(uname -m)-w64-linux \ - --host=x86_64-w64-mingw32 \ - --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \ - --with-gtk=3.0 - make - make install - fi fi if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then |