summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-04-24 17:14:00 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-04-24 17:14:00 +0200
commit02b40657dd96d3be1cde55274d2efd65485726e0 (patch)
tree7c682bc724cb16581418afd7d0733701e10dc840
parent8126778fdfcb3fbc6e2b1645c60ea8c36237c301 (diff)
Fix build for windows
-rwxr-xr-xbinary/mingw/build-dist2
-rwxr-xr-xbinary/mingw/libodb-qt-configure6
2 files changed, 6 insertions, 2 deletions
diff --git a/binary/mingw/build-dist b/binary/mingw/build-dist
index b4fc4dc..e01679d 100755
--- a/binary/mingw/build-dist
+++ b/binary/mingw/build-dist
@@ -55,7 +55,7 @@ if [ $rebuild = y ]; then
rm -rf libcutl
rm -rf libodb
rm -rf libodb-boost
- rn -rf libodb-qt
+ rm -rf libodb-qt
rm -rf odb
rm -rf odb-build/*
rm -rf $install_root
diff --git a/binary/mingw/libodb-qt-configure b/binary/mingw/libodb-qt-configure
index ea8dd72..bc9b88a 100755
--- a/binary/mingw/libodb-qt-configure
+++ b/binary/mingw/libodb-qt-configure
@@ -1,5 +1,7 @@
#! /bin/sh
+wd=`pwd`
+
./configure \
--disable-shared \
--enable-static \
@@ -7,4 +9,6 @@
--target i686-mingw32 \
--prefix=/mingw \
--with-libodb=../libodb \
-CXXFLAGS="-O2 -W -Wall"
+CXXFLAGS="-O2 -W -Wall" \
+CPPFLAGS="-I$wd/../cross/qtcore/include -I$wd/../cross/qtcore/include/QtCore" \
+LDFLAGS="-L$wd/../cross/qtcore/lib"