Compile Fehler behoben - deklarations fehler mit neuer Compiler wversion..
git-svn-id: svn://svn.compuextreme.de/Viitor/V963/ViitorMake@6167 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
57a62763cf
commit
203bb1bb63
@ -82,12 +82,16 @@ mk32() {
|
|||||||
python configure.py --confirm-license
|
python configure.py --confirm-license
|
||||||
find . -name "Makefile" -exec sed -i "s/\((LFLAGS)\)/\1 -m32/" {} \;
|
find . -name "Makefile" -exec sed -i "s/\((LFLAGS)\)/\1 -m32/" {} \;
|
||||||
find . -name "Makefile" -exec sed -i "s/\(-shared\)/-m32 \1/g" {} \;
|
find . -name "Makefile" -exec sed -i "s/\(-shared\)/-m32 \1/g" {} \;
|
||||||
|
cp designer/pluginloader.cpp{,.orig}
|
||||||
|
PYTHON_LIB=$(grep PYTHON_LIB designer/python.pro|awk -F"=" '{print $3}'|sed -e "s/\\\//g")
|
||||||
|
sed -i "s/PYTHON_LIB/${PYTHON_LIB}/" designer/pluginloader.cpp
|
||||||
make -j $NUMCPU \
|
make -j $NUMCPU \
|
||||||
CFLAGS="$BUILDOPTIONS32" \
|
CFLAGS="$BUILDOPTIONS32" \
|
||||||
CXXFLAGS="$BUILDOPTIONS32" \
|
CXXFLAGS="$BUILDOPTIONS32" \
|
||||||
LDEMULATION="elf32_i386"
|
LDEMULATION="elf32_i386"
|
||||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||||
make clean
|
make clean
|
||||||
|
cp designer/pluginloader.cpp.orig designer/pluginloader.cpp
|
||||||
}
|
}
|
||||||
|
|
||||||
mk() {
|
mk() {
|
||||||
@ -96,6 +100,8 @@ mk() {
|
|||||||
USE_ARCH=$UARCH \
|
USE_ARCH=$UARCH \
|
||||||
QMAKESPEC=linux-g++-$UARCH \
|
QMAKESPEC=linux-g++-$UARCH \
|
||||||
python configure.py --confirm-license
|
python configure.py --confirm-license
|
||||||
|
PYTHON_LIB=$(grep PYTHON_LIB designer/python.pro|awk -F"=" '{print $3}'|sed -e "s/\\\//g")
|
||||||
|
sed -i "s/PYTHON_LIB/${PYTHON_LIB}/" designer/pluginloader.cpp
|
||||||
make -j $NUMCPU \
|
make -j $NUMCPU \
|
||||||
CFLAGS="$BUILDOPTIONS -fPIC" \
|
CFLAGS="$BUILDOPTIONS -fPIC" \
|
||||||
CXXFLAGS="$BUILDOPTIONS -fPIC"
|
CXXFLAGS="$BUILDOPTIONS -fPIC"
|
||||||
|
Loading…
Reference in New Issue
Block a user