mirror of https://github.com/vitalif/openscad
enable build of glew + opencsg with clang from script
parent
dec26f84dd
commit
b22951af47
|
@ -109,6 +109,8 @@ netbsd* {
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
|
||||||
QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
|
||||||
|
# might want to actually turn this on once in a while
|
||||||
|
QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
|
||||||
}
|
}
|
||||||
|
|
||||||
CONFIG(skip-version-check) {
|
CONFIG(skip-version-check) {
|
||||||
|
|
|
@ -120,7 +120,8 @@ build_boost()
|
||||||
./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex
|
./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex
|
||||||
if [ $CXX ]; then
|
if [ $CXX ]; then
|
||||||
if [ $CXX = "clang" ]; then
|
if [ $CXX = "clang" ]; then
|
||||||
./b2 -j$NUMCPU toolset=clang cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" install
|
./b2 -j$NUMCPU toolset=clang install
|
||||||
|
# ./b2 -j$NUMCPU toolset=clang cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" install
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
./b2 -j$NUMCPU
|
./b2 -j$NUMCPU
|
||||||
|
@ -171,7 +172,14 @@ build_glew()
|
||||||
sed -ibak s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ config/Makefile.linux
|
sed -ibak s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ config/Makefile.linux
|
||||||
fi
|
fi
|
||||||
|
|
||||||
GLEW_DEST=$DEPLOYDIR make -j$NUMCPU
|
if [ $CC ]; then
|
||||||
|
if [ $CC = "clang" ]; then
|
||||||
|
echo "modifying glew makefile for clang"
|
||||||
|
sed -i s/\$\(CC\)/clang/ Makefile
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
GLEW_DEST=$DEPLOYDIR make -j$NUMCPU
|
||||||
GLEW_DEST=$DEPLOYDIR make install
|
GLEW_DEST=$DEPLOYDIR make install
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -195,10 +203,20 @@ build_opencsg()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "`command -v qmake-qt4`" ]; then
|
if [ "`command -v qmake-qt4`" ]; then
|
||||||
qmake-qt4
|
OPCSG_QM = qmake-qt4
|
||||||
else
|
else
|
||||||
qmake
|
OPCSG_QM = qmake
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ $CXX ]; then
|
||||||
|
if [ $CXX = "clang++" ]; then
|
||||||
|
cd $BASEDIR/src/opencsg-$version/src
|
||||||
|
$(OPCSG_QM)
|
||||||
|
cd $BASEDIR/src/opencsg-$version
|
||||||
|
$(OPCSG_QM)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
make
|
make
|
||||||
cp -av lib/* $DEPLOYDIR/lib
|
cp -av lib/* $DEPLOYDIR/lib
|
||||||
cp -av include/* $DEPLOYDIR/include
|
cp -av include/* $DEPLOYDIR/include
|
||||||
|
|
|
@ -1,8 +1,12 @@
|
||||||
# build dependencies and openscad on linux with clang.
|
# build dependencies and/or openscad on linux with the clang compiler
|
||||||
|
|
||||||
export CC=clang
|
export CC=clang
|
||||||
export CXX=clang++
|
export CXX=clang++
|
||||||
export QMAKESPEC=unsupported/linux-clang
|
export QMAKESPEC=unsupported/linux-clang
|
||||||
|
|
||||||
|
echo CC has been modified: $CC
|
||||||
|
echo CXX has been modified: $CXX
|
||||||
|
echo QMAKESPEC has been modified: $QMAKESPEC
|
||||||
|
|
||||||
. ./scripts/setenv-linbuild.sh
|
. ./scripts/setenv-linbuild.sh
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue