diff options
| -rw-r--r-- | README.md | 20 | ||||
| -rwxr-xr-x | scripts/freebsd-build-dependencies.sh | 28 | ||||
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 8 | ||||
| -rw-r--r-- | scripts/setenv-freebsdbuild.sh | 6 | ||||
| -rw-r--r-- | src/OpenCSGWarningDialog.cc | 4 |
5 files changed, 60 insertions, 6 deletions
@@ -97,6 +97,20 @@ Follow the instructions for the platform you're compiling on below. * [Bison (2.4)](http://www.gnu.org/software/bison/) * [Flex (2.5.35)](http://flex.sourceforge.net/) +### Getting the source code + +Install git (http://git-scm.com/) onto your system. Then run a clone: + + git clone git://github.com/openscad/openscad.git + +This will download the latest sources into a directory named 'openscad'. + +To pull the MCAD library (http://reprap.org/wiki/MCAD), do the following: + + cd openscad + git submodule init + git submodule update + ### Building for Mac OS X First, make sure that you have XCode installed to get GCC. Then after @@ -124,9 +138,9 @@ Then after you've cloned this git repository, use a package manager to download packages for the dependency libraries listed above. Convenience scripts are provided for some popular systems: -Ubuntu, Debian: ./scripts/ubuntu-build-dependencies.sh -OpenSUSE: ./scripts/opensuse-build-dependencies.sh -Fedora, Redhat: ./scripts/fedora-build-dependencies.sh + Ubuntu, Debian: ./scripts/ubuntu-build-dependencies.sh + OpenSUSE: ./scripts/opensuse-build-dependencies.sh + Fedora: ./scripts/fedora-build-dependencies.sh Check your library versions to make sure they meet the minimum requirements listed above. After that follow the Compilation diff --git a/scripts/freebsd-build-dependencies.sh b/scripts/freebsd-build-dependencies.sh new file mode 100755 index 0000000..4ea61de --- /dev/null +++ b/scripts/freebsd-build-dependencies.sh @@ -0,0 +1,28 @@ +#!/usr/local/bin/bash -e + +echo "Tested on FreeBSD 9. Please see README.md for info on older systems." + +if [ "`pkg_info | grep -i cgal `" ]; then + echo Stopping. Please remove any CGAL packages you have installed and restart + exit +fi + +if [ "`pkg_info | grep -i opencsg`" ]; then + echo Stopping. Please remove any OpenCSG packages you have installed and restart + exit +fi + +OPENSCADDIR=$PWD +if [ ! -f $OPENSCADDIR/openscad.pro ]; then + echo "Must be run from the OpenSCAD source root directory" + exit 0 +fi + +. ./scripts/setenv-freebsdbuild.sh + +pkg_add -r bison boost-libs cmake git bash eigen2 flex gmake gmp mpfr +pkg_add -r xorg libGLU libXmu libXi xorg-vfbserver glew +pkg_add -r qt4-corelib qt4-gui qt4-moc qt4-opengl qt4-qmake qt4-rcc qt4-uic + +BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh cgal-use-sys-libs +BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh opencsg diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index 36dc2ee..bc1e74d 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -188,12 +188,18 @@ build_opencsg() sed -ibak s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ src/Makefile fi + if [ `uname | grep FreeBSD` ]; then + sed -ibak s/X11R6/local/g src/Makefile + fi + if [ "`command -v qmake-qt4`" ]; then qmake-qt4 else qmake fi + make + cp -av lib/* $DEPLOYDIR/lib cp -av include/* $DEPLOYDIR/include } @@ -235,7 +241,7 @@ if [ ! $NUMCPU ]; then fi if [ ! -d $BASEDIR/bin ]; then - mkdir --parents $BASEDIR/bin + mkdir -p $BASEDIR/bin fi echo "Using basedir:" $BASEDIR diff --git a/scripts/setenv-freebsdbuild.sh b/scripts/setenv-freebsdbuild.sh new file mode 100644 index 0000000..49f1783 --- /dev/null +++ b/scripts/setenv-freebsdbuild.sh @@ -0,0 +1,6 @@ +# run with '. ./scripts/setenv-freebsdbuild.sh' + +# use in conjuction with freebsd-build-dependencies.sh + +QMAKESPEC=freebsd-g++ +QTDIR=/usr/local/share/qt4 diff --git a/src/OpenCSGWarningDialog.cc b/src/OpenCSGWarningDialog.cc index 926a55b..5648576 100644 --- a/src/OpenCSGWarningDialog.cc +++ b/src/OpenCSGWarningDialog.cc @@ -8,12 +8,12 @@ OpenCSGWarningDialog::OpenCSGWarningDialog(QWidget*) connect(this->showBox, SIGNAL(toggled(bool)), Preferences::inst()->openCSGWarningBox, SLOT(setChecked(bool))); connect(this->showBox, SIGNAL(toggled(bool)), - Preferences::inst(), SLOT(on_openCSGWarningBox_toggled(bool))); + Preferences::inst(), SLOT(openCSGWarningChanged(bool))); connect(this->enableOpenCSGBox, SIGNAL(toggled(bool)), Preferences::inst()->enableOpenCSGBox, SLOT(setChecked(bool))); connect(this->enableOpenCSGBox, SIGNAL(toggled(bool)), - Preferences::inst(), SLOT(on_enableOpenCSGBox_toggled(bool))); + Preferences::inst(), SLOT(enableOpenCSGChanged(bool))); } void OpenCSGWarningDialog::setText(const QString &text) |