vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Marius Kintel: 

Some patches for MacOS X
	Set text editor font to QFont::TypeWriter



git-svn-id: http://svn.clifford.at/openscad/trunk@120 b57f626f-c46c-0410-a088-ec61d464b74c
stl_dim
clifford 2009-10-25 20:35:03 +00:00
parent a201b851e6
commit dc1450e47f
5 changed files with 92 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
checklist-macosx.txt Normal file
View File

@ -0,0 +1,43 @@
o Build CGAL:
cd CGAL-3.5
source runcmake.sh
make -j4
make install
o Patch OpenCSG
patch -p0 < OpenCSG-MacOSX-port.patch
o Build OpenCSG
cd OpenCSG-1.1.1
qmake -recursive
make
o Build OpenSCAD
cd openscad
qmake
make -j4
o Deploy
mkdir openscad.app/Contents/Frameworks
cp ../OpenCSG-1.1.1/lib/libopencsg.dylib openscad.app/Contents/Frameworks
cp /opt/local/lib/libGLEW.1.5.1.dylib openscad.app/Contents/Frameworks
cp /Library/Frameworks/QtOpenGL.framework/Versions/4/QtOpenGL openscad.app/Contents/Frameworks
cp /Library/Frameworks/QtGui.framework/Versions/4/QtGui openscad.app/Contents/Frameworks
cp /Library/Frameworks/QtCore.framework/Versions/4/QtCore openscad.app/Contents/Frameworks
install_name_tool -change libopencsg.1.dylib @executable_path/../Frameworks/libopencsg.dylib openscad.app/Contents/MacOS/openscad
install_name_tool -change QtOpenGL.framework/Versions/4/QtOpenGL @executable_path/../Frameworks/QtOpenGL openscad.app/Contents/MacOS/openscad
install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui openscad.app/Contents/MacOS/openscad
install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore openscad.app/Contents/MacOS/openscad
install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui openscad.app/Contents/Frameworks/QtOpenGL
install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore openscad.app/Contents/Frameworks/QtOpenGL
install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore openscad.app/Contents/Frameworks/QtGui
install_name_tool -change /opt/local/lib/libGLEW.1.5.1.dylib @executable_path/../Frameworks/libGLEW.1.5.1.dylib openscad.app/Contents/MacOS/openscad
install_name_tool -change /opt/local/lib/libGLEW.1.5.1.dylib @executable_path/../Frameworks/libGLEW.1.5.1.dylib openscad.app/Contents/Frameworks/libopencsg.dylib

4
mainwin.cc
View File

@ -78,6 +78,10 @@ MainWindow::MainWindow(const char *filename)
s1 = new QSplitter(Qt::Horizontal, this);
editor = new QTextEdit(s1);
QFont font;
font.setStyleHint(QFont::TypeWriter);
editor->setFont(font);
QWidget *w1 = new QWidget(s1);
QVBoxLayout *l1 = new QVBoxLayout(w1);
l1->setSpacing(0);

3
openscad.cc
View File

@ -69,6 +69,9 @@ int main(int argc, char **argv)
bool useGUI = true;
#endif
QApplication app(argc, argv, useGUI);
#ifdef __APPLE__
app.setLibraryPaths(QStringList(app.applicationDirPath() + "/../PlugIns"));
#endif
const char *filename = NULL;
const char *stl_output_file = NULL;

19
openscad.pro
View File

@ -1,9 +1,26 @@
macx {
TARGET = OpenSCAD
}
else {
TARGET = openscad
}
CONFIG += qt debug
TEMPLATE = app
DEFINES += "ENABLE_CGAL=1"
LIBS += -lCGAL -lmpfr
LIBS += -lCGAL
macx {
INCLUDEPATH += $(PWD)/../install/include $(PWD)/../OpenCSG-1.1.1/include /opt/local/include
# The -L/usr/lib is to force the linker to use system libraries over MacPort libraries
LIBS += -L/usr/lib -L$(PWD)/../install/lib -L$(PWD)/../OpenCSG-1.1.1/lib -L/opt/local/lib /opt/local/lib/libgmp.a /opt/local/lib/libmpfr.a /opt/local/lib/libboost_thread-mt.a
QMAKE_CXXFLAGS += -frounding-math
}
else {
LIBS += -lmpfr
}
DEFINES += "ENABLE_OPENCSG=1"
LIBS += -lopencsg

24
release-macosx.sh Normal file
View File

@ -0,0 +1,24 @@
#!/bin/sh
# WARNING: This script might only work with the authors setup...
mkdir openscad.app/Contents/Frameworks
cp ../OpenCSG-1.1.1/lib/libopencsg.dylib openscad.app/Contents/Frameworks
cp /opt/local/lib/libGLEW.1.5.1.dylib openscad.app/Contents/Frameworks
cp /Library/Frameworks/QtOpenGL.framework/Versions/4/QtOpenGL openscad.app/Contents/Frameworks
cp /Library/Frameworks/QtGui.framework/Versions/4/QtGui openscad.app/Contents/Frameworks
cp /Library/Frameworks/QtCore.framework/Versions/4/QtCore openscad.app/Contents/Frameworks
install_name_tool -change libopencsg.1.dylib @executable_path/../Frameworks/libopencsg.dylib openscad.app/Contents/MacOS/openscad
install_name_tool -change QtOpenGL.framework/Versions/4/QtOpenGL @executable_path/../Frameworks/QtOpenGL openscad.app/Contents/MacOS/openscad
install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui openscad.app/Contents/MacOS/openscad
install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore openscad.app/Contents/MacOS/openscad
install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui openscad.app/Contents/Frameworks/QtOpenGL
install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore openscad.app/Contents/Frameworks/QtOpenGL
install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore openscad.app/Contents/Frameworks/QtGui
install_name_tool -change /opt/local/lib/libGLEW.1.5.1.dylib @executable_path/../Frameworks/libGLEW.1.5.1.dylib openscad.app/Contents/MacOS/openscad
install_name_tool -change /opt/local/lib/libGLEW.1.5.1.dylib @executable_path/../Frameworks/libGLEW.1.5.1.dylib openscad.app/Contents/Frameworks/libopencsg.dylib
mkdir -p openscad/examples
cp examples/* openscad/examples/
chmod -R 644 openscad/examples/*
mv OpenSCAD.app openscad