Bugfixes for Mac build

git-svn-id: http://svn.clifford.at/openscad/trunk@335 b57f626f-c46c-0410-a088-ec61d464b74c
stl_dim
kintel 2010-01-22 13:22:16 +00:00
parent 8561215e09
commit e0ca60eef7
3 changed files with 7 additions and 3 deletions

View File

@ -3,6 +3,8 @@
VERSION=`date "+%Y.%m.%d"` VERSION=`date "+%Y.%m.%d"`
#VERSION=2010.02 #VERSION=2010.02
./release-macosx.sh -v $VERSION export OPENCSGDIR=$PWD/../OpenCSG-1.2.0
./release-common.sh -v $VERSION
cp openscad-$VERSION.zip ~/Documents/Dropbox/Public cp openscad-$VERSION.zip ~/Documents/Dropbox/Public
ln -sf openscad-$VERSION.zip ~/Documents/Dropbox/Public/openscad-latest.zip ln -sf openscad-$VERSION.zip ~/Documents/Dropbox/Public/openscad-latest.zip

View File

@ -58,7 +58,7 @@ case $OS in
;; ;;
esac esac
qmake VERSION=$VERSION CONFIG+=$CONFIG CONFIG-=debug qmake VERSION=$VERSION CONFIG+=$CONFIG CONFIG-=debug openscad.pro
make -s clean make -s clean
case $OS in case $OS in
MACOSX) MACOSX)
@ -77,6 +77,7 @@ rm -rf openscad-$VERSION
rm -f openscad-$VERSION.zip rm -f openscad-$VERSION.zip
mkdir -p openscad-$VERSION/examples mkdir -p openscad-$VERSION/examples
cp examples/* openscad-$VERSION/examples/ cp examples/* openscad-$VERSION/examples/
chmod -R 644 openscad-$VERSION/examples/*
case $OS in case $OS in
MACOSX) MACOSX)
@ -99,6 +100,7 @@ case $OS in
install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui OpenSCAD.app/Contents/Frameworks/libopencsg.dylib install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui OpenSCAD.app/Contents/Frameworks/libopencsg.dylib
install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore OpenSCAD.app/Contents/Frameworks/libopencsg.dylib install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore OpenSCAD.app/Contents/Frameworks/libopencsg.dylib
install_name_tool -id libGLEW.1.5.1.dylib OpenSCAD.app/Contents/Frameworks/libGLEW.1.5.1.dylib install_name_tool -id libGLEW.1.5.1.dylib OpenSCAD.app/Contents/Frameworks/libGLEW.1.5.1.dylib
mv OpenSCAD.app openscad-$VERSION
;; ;;
WIN) WIN)
#package #package

View File

@ -29,7 +29,7 @@ fi
echo "Building openscad-$VERSION..." echo "Building openscad-$VERSION..."
export OPENCSGDIR=$PWD/../OpenCSG-1.2.0 export OPENCSGDIR=$PWD/../OpenCSG-1.2.0
qmake VERSION=$VERSION CONFIG+=mdi qmake VERSION=$VERSION CONFIG+=mdi openscad.pro
make clean make clean
make -j2 make -j2
echo "Preparing executable.." echo "Preparing executable.."