diff --git a/openscad.pro.user b/openscad.pro.user new file mode 100644 index 0000000000..4bce49a0eb --- /dev/null +++ b/openscad.pro.user @@ -0,0 +1,421 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + System + false + 4 + true + 1 + true + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + Qt4ProjectManager.Target.DesktopTarget + 1 + 0 + 0 + + INVALID + + + qmake + + QtProjectManager.QMakeBuildStep + false + false + + false + + + Make + + Qt4ProjectManager.MakeStep + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + Make + + Qt4ProjectManager.MakeStep + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + OPENSCAD_LIBRARIES=$$PWD/../libraries/install + + MacPorts QT4 Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + /Users/clothbot/Projects/github/clothbot/openscad-build-desktop + -1 + true + + + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit./usr/bin/gdb + + + qmake + + QtProjectManager.QMakeBuildStep + false + false + -spec macx-g++ + false + + + Make + + Qt4ProjectManager.MakeStep + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + Make + + Qt4ProjectManager.MakeStep + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + OPENSCAD_LIBRARIES=$$PWD/../libraries/install + + Desktop Qt 4.7.4 for GCC (Qt SDK) Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + /Users/clothbot/Projects/github/clothbot/openscad-build-desktop + 3 + true + + + INVALID + + + qmake + + QtProjectManager.QMakeBuildStep + false + false + + false + + + Make + + Qt4ProjectManager.MakeStep + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + Make + + Qt4ProjectManager.MakeStep + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + 4.7.4 Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + /Users/clothbot/Projects/github/clothbot/openscad-build-desktop + -1 + true + + + INVALID + + + qmake + + QtProjectManager.QMakeBuildStep + false + false + + false + + + Make + + Qt4ProjectManager.MakeStep + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + Make + + Qt4ProjectManager.MakeStep + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + 4.7.4 Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + /Users/clothbot/Projects/github/clothbot/openscad-build-desktop + -1 + true + + + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit./usr/bin/gdb + + + qmake + Clone of qmake + QtProjectManager.QMakeBuildStep + false + false + -spec macx-g++ + false + + + Make + Clone of Make + Qt4ProjectManager.MakeStep + false + + + + 2 + Build + Clone of Build + ProjectExplorer.BuildSteps.Build + + + + Make + Clone of Make + Qt4ProjectManager.MakeStep + true + clean + + + 1 + Clean + Clone of Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + OPENSCAD_LIBRARIES=$$PWD/../libraries/install + + Desktop Qt 4.7.4 for GCC (Qt SDK) Debug + Desktop Qt 4.7.4 for GCC (Qt SDK) + Qt4ProjectManager.Qt4BuildConfiguration + 0 + /Users/clothbot/Projects/github/clothbot/openscad-release-desktop + 3 + true + + 5 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + No deployment + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + + + false + false + false + false + false + false + false + false + true + true + 0.01 + 0.01 + 10 + 10 + true + true + 25 + 25 + + + true + true + valgrind + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + openscad + + Qt4ProjectManager.Qt4RunConfiguration + 2 + + openscad.pro + false + false + + + 3768 + true + false + false + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {b7a15081-01e1-47e4-b2e5-20f6404deb62} + + + ProjectExplorer.Project.Updater.FileVersion + 10 + + diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 68b820064d..4bcafd372d 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -17,8 +17,8 @@ # o Port to other platforms? # -BASEDIR=/Users/kintel/code/OpenSCAD/libraries -OPENSCADDIR=/Users/kintel/code/OpenSCAD/openscad +BASEDIR=$PWD/../libraries +OPENSCADDIR=$PWD SRCDIR=$BASEDIR/src DEPLOYDIR=$BASEDIR/install diff --git a/src/Preferences.ui b/src/Preferences.ui index 9ca8179e35..9b4671a477 100644 --- a/src/Preferences.ui +++ b/src/Preferences.ui @@ -228,11 +228,7 @@ openCSGWarningBox - enableOpenCSGBox - enableOpenCSGBox - - openCSGWarningBox forceGoldfeatherBox