closes #15

14 years ago · 04bba8749d
parent e444a3f0bd
commit 04bba8749d
2 changed files with 35 additions and 34 deletions
--- a/install-32-bit-lin-win.sh
+++ b/install-32-bit-lin-win.sh
@ -1,14 +1,14 @@
 ./bootstrap.sh && \
-LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
-  CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
-  ./configure \
-  --with-qt-dir=/usr/local/trolltech/qt-mingw32/include \
-  --prefix=/opt/local/i586-mingw32msvc \
-  --build=x86_64 \
-  --host=i586-mingw32msvc && \
-make && \
-sudo make install && \
-make clean && \
-./configure --with-qt-dir=/usr/local/trolltech/qt/include && \
-make check && \
-sudo make install
+    LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
+    CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
+    ./configure \
+    --with-qt-dir=/usr/local/trolltech/qt-mingw32/include \
+    --prefix=/opt/local/i586-mingw32msvc \
+    --build=x86_64 \
+    --host=i586-mingw32msvc && \
+    make && \
+    sudo make install && \
+    make clean && \
+    ./configure --with-qt-dir=/usr/local/trolltech/qt/include && \
+    make check && \
+    sudo make install
--- a/install-64-and-32-bit-linux.sh
+++ b/install-64-and-32-bit-linux.sh
@ -1,22 +1,23 @@
 ./bootstrap.sh && \
-LDFLAGS="-L/usr/lib32 -m32" CXXFLAGS="-m32" ./configure \
-  --with-qt-dir=/usr/local/trolltech/qt-32bit/include \
-  --libdir=/usr/local/lib32 \
-  --build=x86_64 \
-  --host=i386 && \
-make && \
-sudo make install && \
-make clean && \
-LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
-  CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
-  ./configure \
-  --with-qt-dir=/usr/local/trolltech/qt-mingw32/include \
-  --prefix=/opt/local/i586-mingw32msvc \
-  --build=x86_64 \
-  --host=i586-mingw32msvc && \
-make && \
-sudo make install && \
-make clean && \
-./configure --with-qt-dir=/usr/local/trolltech/qt/include && \
-make check && \
-sudo make install
+    LDFLAGS="-L/usr/local/trolltech/qt-mingw32/lib -L/usr/lib32 -m32" \
+    CXXFLAGS="-m32" ./configure \
+    --with-qt-dir=/usr/local/trolltech/qt-32bit/include \
+    --libdir=/usr/local/lib32 \
+    --build=x86_64 \
+    --host=i386 && \
+    make && \
+    sudo make install && \
+    make clean && \
+    LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
+    CPPFLAGS="-I/opt/local/i586-mingw32msvc/include -DQ_OS_WIN32" \
+    ./configure \
+    --with-qt-dir=/usr/local/trolltech/qt-mingw32/include \
+    --prefix=/opt/local/i586-mingw32msvc \
+    --build=x86_64 \
+    --host=i586-mingw32msvc && \
+    make && \
+    sudo make install && \
+    make clean && \
+    ./configure --with-qt-dir=/usr/local/trolltech/qt/include && \
+    make check && \
+    sudo make install