Modifikationen für 32/64 Bit
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5130 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
252fc594d9
commit
410f704feb
@ -88,14 +88,26 @@ mk32() {
|
||||
make -j $NUMCPU USE_ARCH=32 CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32"
|
||||
./generator
|
||||
cd ../qtbindings
|
||||
cp generator $TMPROOT/opt/qt-4/bin/generator-32
|
||||
cd ../tools/qsexec/src
|
||||
USE_ARCH=32 qmake
|
||||
if [ "MK64BIT" == "true" ]; then
|
||||
find . -name "Makefile*" -exec sed -i "s/m32/m64/g" {} \;
|
||||
fi
|
||||
make -j $NUMCPU CC="gcc $BUILDOPTIONS" \
|
||||
CXX="g++ $BUILDOPTIONS"
|
||||
cd ..
|
||||
cp qsexec $TMPROOT/opt/qt-4/bin/qsexec-32
|
||||
cd ../../qtbindings
|
||||
USE_ARCH=32 qmake
|
||||
find . -name "Makefile*" -exec sed -i "s/m64/m32/g" {} \;
|
||||
make -j $NUMCPU USE_ARCH=32 CC="gcc $BUILDOPTIONS32" \
|
||||
CXX="g++ $BUILDOPTIONS32"
|
||||
cd ../plugins
|
||||
tar -cf - .|tar -C $TMPROOT/opt/qt-4/lib/plugins -xvf -
|
||||
cd ../qtbindings
|
||||
cd ../tools/qsexec/src
|
||||
make distclean
|
||||
cd ../../../qtbindings
|
||||
make distclean
|
||||
cd ../generator
|
||||
make distclean
|
||||
@ -138,5 +150,10 @@ mk() {
|
||||
}
|
||||
|
||||
postmk() {
|
||||
echo "Nothing to do for postmk()"
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
mv $TMPROOT/opt/qt-4/bin/generator{,-64}
|
||||
mv $TMPROOT/opt/qt-4/bin/qsexec{,-64}
|
||||
ln -s /usr/bin/multiarch_wrapper $TMPROOT/opt/qt-4/bin/generator
|
||||
ln -s /usr/bin/multiarch_wrapper $TMPROOT/opt/qt-4/bin/qsexec
|
||||
fi
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user