diff options
| -rwxr-xr-x | binary/mingw/build-dist | 25 | ||||
| -rwxr-xr-x | binary/mingw/libodb-qt-configure | 10 | ||||
| -rwxr-xr-x | dist.sh | 2 |
3 files changed, 35 insertions, 2 deletions
diff --git a/binary/mingw/build-dist b/binary/mingw/build-dist index 23a5834..7914f8b 100755 --- a/binary/mingw/build-dist +++ b/binary/mingw/build-dist @@ -135,6 +135,31 @@ make make install-data cd .. +# Build libodb-qt +# +if [ $pack = n ]; then + make -C $src_root/odb/libodb-qt dist dist_prefix=$out_root/libodb-qt + + if [ $rebuild = y ]; then + cd libodb-qt + ./bootstrap + cd .. + fi +else + tar xfz $src_root/pack/libodb-qt-$version.tar.gz + mv libodb-qt-$version libodb-qt +fi + +cd libodb-qt + +if [ $rebuild = y ]; then + ../libodb-qt-configure +fi + +make +make install-data +cd .. + # Build libcutl # if [ $pack = n ]; then diff --git a/binary/mingw/libodb-qt-configure b/binary/mingw/libodb-qt-configure new file mode 100755 index 0000000..ea8dd72 --- /dev/null +++ b/binary/mingw/libodb-qt-configure @@ -0,0 +1,10 @@ +#! /bin/sh + +./configure \ +--disable-shared \ +--enable-static \ +--host i686-mingw32 \ +--target i686-mingw32 \ +--prefix=/mingw \ +--with-libodb=../libodb \ +CXXFLAGS="-O2 -W -Wall" @@ -274,7 +274,6 @@ for d in $db; do --with-libodb-tracer=../libodb-tracer \ --with-libodb-$d=../libodb-$d \ --with-libodb-boost=../libodb-boost \ ---with-libodb-qt=../libodb-qt \ CXXFLAGS="$CXXFLAGS" \ ODB=$odb fi @@ -321,7 +320,6 @@ for d in $db; do --with-libodb=../libodb \ --with-libodb-$d=../libodb-$d \ --with-libodb-boost=../libodb-boost \ ---with-libodb-qt=../libodb-qt \ CXXFLAGS="$CXXFLAGS" \ ODB=$odb fi |