diff options
Diffstat (limited to 'autobuild.sh')
| -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 |