From 6d53b35f5b43de526248945aa046e37e8192845e Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Tue, 24 Apr 2012 11:50:41 +0200 Subject: Actually lock X for middle mouse button panning diff --git a/src/glview.cc b/src/glview.cc index 12657b8..aa2e746 100644 --- a/src/glview.cc +++ b/src/glview.cc @@ -603,6 +603,9 @@ void GLView::mouseMoveEvent(QMouseEvent *event) if (event->buttons() & Qt::MiddleButton) { my = mz; mz = 0; + // actually lock the x-position + // (turns out to be easier to use than xy panning) + mx = 0; } Matrix3d aax, aay, aaz, tm3; -- cgit v0.10.1 From 74a380df150fe21a0e432a9fc2f80824ce17097e Mon Sep 17 00:00:00 2001 From: Wil Chung Date: Mon, 7 May 2012 11:24:21 -0700 Subject: added md extension to README to get it to render correctly on Github diff --git a/README b/README deleted file mode 100644 index c00ecb0..0000000 --- a/README +++ /dev/null @@ -1,88 +0,0 @@ - -WHAT IS IT? -=========== - -OpenSCAD is a software for creating solid 3D CAD objects. It is free software -and available for Linux/UNIX, MS Windows and Mac OS X. - -Unlike most free software for creating 3D models (such as the famous -application Blender) it does not focus on the artistic aspects of 3D modelling -but instead on the CAD aspects. Thus it might be the application you are -looking for when you are planning to create 3D models of machine parts but -pretty sure is not what you are looking for when you are more interested in -creating computer-animated movies. - -OpenSCAD is not an interactive modeller. Instead it is something like a -3D-compiler that reads in a script file that describes the object and renders -the 3D model from this script file (see examples below). This gives you (the -designer) full control over the modelling process and enables you to easily -change any step in the modelling process or make designs that are defined by -configurable parameters. - -OpenSCAD provides two main modelling techniques: First there is constructive -solid geometry (aka CSG) and second there is extrusion of 2D outlines. As data -exchange format format for this 2D outlines Autocad DXF files are used. In -addition to 2D paths for extrusion it is also possible to read design parametes -from DXF files. Besides DXF files OpenSCAD can read and create 3D models in the -STL and OFF file formats. - - -PREREQUISITES -============= - -To build OpenSCAD, you need some libraries and tools. The version -numbers in brackets specify the versions which have been used for -development. Other versions may or may not work as well.. - -* Qt4 (4.4 - 4.7): - http://www.qt.nokia.com/ - -* CGAL (3.6 - 3.9): - http://www.cgal.org/ - -* GMP (5.0.x): - http://www.gmplib.org/ - -* MPFR (3.x): - http://www.mpfr.org/ - -* boost (1.35 - 1.47) - http://www.boost.org/ - -* cmake (2.6 - 2.8, required by CGAL and the test framework) - http://www.cmake.org/ - -* OpenCSG (1.3.2): - http://www.opencsg.org/ - -* GLEW (1.6 ->) - http://glew.sourceforge.net/ - -* Eigen2 (2.0.13->) - http://eigen.tuxfamily.org/ - -* GCC C++ Compiler (4.2 ->): - http://gcc.gnu.org/ - -* Bison (2.4): - http://www.gnu.org/software/bison/ - -* Flex (2.5.35): - http://flex.sourceforge.net/ - - -BUILDING OPENSCAD -================ - -First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to -run 'qmake4', 'qmake-qt4' or something alike to run the qt4 version of the tool. - -Then run make. Finally you might run 'make install' as root or simply copy the -'openscad' binary (OpenSCAD.app on Mac OS X) to the bin directory of your choice. - - -DOCUMENTATION -============= - -Have a look at the OpenSCAD Homepage (http://openscad.org/) for documentation. - diff --git a/README.md b/README.md new file mode 100644 index 0000000..c00ecb0 --- /dev/null +++ b/README.md @@ -0,0 +1,88 @@ + +WHAT IS IT? +=========== + +OpenSCAD is a software for creating solid 3D CAD objects. It is free software +and available for Linux/UNIX, MS Windows and Mac OS X. + +Unlike most free software for creating 3D models (such as the famous +application Blender) it does not focus on the artistic aspects of 3D modelling +but instead on the CAD aspects. Thus it might be the application you are +looking for when you are planning to create 3D models of machine parts but +pretty sure is not what you are looking for when you are more interested in +creating computer-animated movies. + +OpenSCAD is not an interactive modeller. Instead it is something like a +3D-compiler that reads in a script file that describes the object and renders +the 3D model from this script file (see examples below). This gives you (the +designer) full control over the modelling process and enables you to easily +change any step in the modelling process or make designs that are defined by +configurable parameters. + +OpenSCAD provides two main modelling techniques: First there is constructive +solid geometry (aka CSG) and second there is extrusion of 2D outlines. As data +exchange format format for this 2D outlines Autocad DXF files are used. In +addition to 2D paths for extrusion it is also possible to read design parametes +from DXF files. Besides DXF files OpenSCAD can read and create 3D models in the +STL and OFF file formats. + + +PREREQUISITES +============= + +To build OpenSCAD, you need some libraries and tools. The version +numbers in brackets specify the versions which have been used for +development. Other versions may or may not work as well.. + +* Qt4 (4.4 - 4.7): + http://www.qt.nokia.com/ + +* CGAL (3.6 - 3.9): + http://www.cgal.org/ + +* GMP (5.0.x): + http://www.gmplib.org/ + +* MPFR (3.x): + http://www.mpfr.org/ + +* boost (1.35 - 1.47) + http://www.boost.org/ + +* cmake (2.6 - 2.8, required by CGAL and the test framework) + http://www.cmake.org/ + +* OpenCSG (1.3.2): + http://www.opencsg.org/ + +* GLEW (1.6 ->) + http://glew.sourceforge.net/ + +* Eigen2 (2.0.13->) + http://eigen.tuxfamily.org/ + +* GCC C++ Compiler (4.2 ->): + http://gcc.gnu.org/ + +* Bison (2.4): + http://www.gnu.org/software/bison/ + +* Flex (2.5.35): + http://flex.sourceforge.net/ + + +BUILDING OPENSCAD +================ + +First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to +run 'qmake4', 'qmake-qt4' or something alike to run the qt4 version of the tool. + +Then run make. Finally you might run 'make install' as root or simply copy the +'openscad' binary (OpenSCAD.app on Mac OS X) to the bin directory of your choice. + + +DOCUMENTATION +============= + +Have a look at the OpenSCAD Homepage (http://openscad.org/) for documentation. + -- cgit v0.10.1 From 56648045cc191d00b935ce6357dcc51d20adffc6 Mon Sep 17 00:00:00 2001 From: Wil Chung Date: Mon, 7 May 2012 11:27:45 -0700 Subject: fixed typos in readme fixed typo diff --git a/README.md b/README.md index c00ecb0..90e2501 100644 --- a/README.md +++ b/README.md @@ -6,23 +6,23 @@ OpenSCAD is a software for creating solid 3D CAD objects. It is free software and available for Linux/UNIX, MS Windows and Mac OS X. Unlike most free software for creating 3D models (such as the famous -application Blender) it does not focus on the artistic aspects of 3D modelling +application Blender) it does not focus on the artistic aspects of 3D modeling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies. -OpenSCAD is not an interactive modeller. Instead it is something like a +OpenSCAD is not an interactive modeler. Instead it is something like a 3D-compiler that reads in a script file that describes the object and renders the 3D model from this script file (see examples below). This gives you (the -designer) full control over the modelling process and enables you to easily -change any step in the modelling process or make designs that are defined by +designer) full control over the modeling process and enables you to easily +change any step in the modeling process or make designs that are defined by configurable parameters. -OpenSCAD provides two main modelling techniques: First there is constructive +OpenSCAD provides two main modeling techniques: First there is constructive solid geometry (aka CSG) and second there is extrusion of 2D outlines. As data exchange format format for this 2D outlines Autocad DXF files are used. In -addition to 2D paths for extrusion it is also possible to read design parametes +addition to 2D paths for extrusion it is also possible to read design parameters from DXF files. Besides DXF files OpenSCAD can read and create 3D models in the STL and OFF file formats. -- cgit v0.10.1 From 725d8f044eae93101cf2bbc42c2e4a3382ca8b1a Mon Sep 17 00:00:00 2001 From: Wil Chung Date: Mon, 7 May 2012 14:15:43 -0700 Subject: Changed prerequisites to links diff --git a/README.md b/README.md index 90e2501..e55c2c1 100644 --- a/README.md +++ b/README.md @@ -34,45 +34,18 @@ To build OpenSCAD, you need some libraries and tools. The version numbers in brackets specify the versions which have been used for development. Other versions may or may not work as well.. -* Qt4 (4.4 - 4.7): - http://www.qt.nokia.com/ - -* CGAL (3.6 - 3.9): - http://www.cgal.org/ - -* GMP (5.0.x): - http://www.gmplib.org/ - -* MPFR (3.x): - http://www.mpfr.org/ - -* boost (1.35 - 1.47) - http://www.boost.org/ - -* cmake (2.6 - 2.8, required by CGAL and the test framework) - http://www.cmake.org/ - -* OpenCSG (1.3.2): - http://www.opencsg.org/ - -* GLEW (1.6 ->) - http://glew.sourceforge.net/ - -* Eigen2 (2.0.13->) - http://eigen.tuxfamily.org/ - -* GCC C++ Compiler (4.2 ->): - http://gcc.gnu.org/ - -* Bison (2.4): - http://www.gnu.org/software/bison/ - -* Flex (2.5.35): - http://flex.sourceforge.net/ - - -BUILDING OPENSCAD -================ +* [Qt4 (4.4 - 4.7)](http://www.qt.nokia.com/) +* [CGAL (3.6 - 3.9)](http://www.cgal.org/) +* [GMP (5.0.x)](http://www.gmplib.org/) +* [MPFR (3.x)](http://www.mpfr.org/) +* [boost (1.35 - 1.47)](http://www.boost.org/) +* [cmake (2.6 - 2.8, required by CGAL and the test framework)](http://www.cmake.org/) +* [OpenCSG (1.3.2)](http://www.opencsg.org/) +* [GLEW (1.6 ->)](http://glew.sourceforge.net/) +* [Eigen2 (2.0.13->)](http://eigen.tuxfamily.org/) +* [GCC C++ Compiler (4.2 ->)](http://gcc.gnu.org/) +* [Bison (2.4)](http://www.gnu.org/software/bison/) +* [Flex (2.5.35)](http://flex.sourceforge.net/) First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to run 'qmake4', 'qmake-qt4' or something alike to run the qt4 version of the tool. -- cgit v0.10.1 From 924aa05f55666b361b7a777570fa6dc95d066686 Mon Sep 17 00:00:00 2001 From: Wil Chung Date: Mon, 7 May 2012 15:00:31 -0700 Subject: added build instructions in the README diff --git a/README.md b/README.md index e55c2c1..7cb5e34 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -WHAT IS IT? -=========== +# What is OpenSCAD? OpenSCAD is a software for creating solid 3D CAD objects. It is free software and available for Linux/UNIX, MS Windows and Mac OS X. @@ -26,20 +25,28 @@ addition to 2D paths for extrusion it is also possible to read design parameters from DXF files. Besides DXF files OpenSCAD can read and create 3D models in the STL and OFF file formats. +# Documentation -PREREQUISITES -============= +Have a look at the OpenSCAD Homepage (http://openscad.org/) for documentation. + +## Building OpenSCAD + +To build OpenSCAD from source, follow the instructions for the platform applicable to you below. + +### Prerequisites To build OpenSCAD, you need some libraries and tools. The version numbers in brackets specify the versions which have been used for -development. Other versions may or may not work as well.. +development. Other versions may or may not work as well. + +If you're using Ubuntu, you can install these libraries from aptitude. If you're using Mac, there is a build script that compiles the libraries from source. Follow the instructions for the platform you're compiling on below. * [Qt4 (4.4 - 4.7)](http://www.qt.nokia.com/) * [CGAL (3.6 - 3.9)](http://www.cgal.org/) -* [GMP (5.0.x)](http://www.gmplib.org/) -* [MPFR (3.x)](http://www.mpfr.org/) -* [boost (1.35 - 1.47)](http://www.boost.org/) -* [cmake (2.6 - 2.8, required by CGAL and the test framework)](http://www.cmake.org/) + * [GMP (5.0.x)](http://www.gmplib.org/) + * [cmake (2.6 - 2.8, required by CGAL and the test framework)](http://www.cmake.org/) + * [MPFR (3.x)](http://www.mpfr.org/) + * [boost (1.35 - 1.47)](http://www.boost.org/) * [OpenCSG (1.3.2)](http://www.opencsg.org/) * [GLEW (1.6 ->)](http://glew.sourceforge.net/) * [Eigen2 (2.0.13->)](http://eigen.tuxfamily.org/) @@ -47,15 +54,35 @@ development. Other versions may or may not work as well.. * [Bison (2.4)](http://www.gnu.org/software/bison/) * [Flex (2.5.35)](http://flex.sourceforge.net/) +### Building for MacOSX + +First, make sure that you have XCode installed to get GCC. Then after you've cloned this git repository, run the script that sets up the environment variables. + + source setenv_maju.sh + +Then run the script to compile all the prerequisite libraries above: + + ./scripts/macosx-build-dependencies.sh + +We currently don't use [port](http://mxcl.github.com/homebrew/) or [brew](http://mxcl.github.com/homebrew/) to install the prerequisite libraries because CGAL doesn't exist on brew and opencsg doesn't exist on ports. And more importantly, there are some patches to GMP in the compilation process. + +After that, follow the Compilation instructions below. + +### Building for Ubuntu + +If you have done this and want to contribute, fork the repo and contribute docs on how to build for windows! + +### Building for Windows + +If you have done this and want to contribute, fork the repo and contribute docs on how to build for windows! + +### Compilation + First, run 'qmake' from Qt4 to generate a Makefile. On some systems you need to run 'qmake4', 'qmake-qt4' or something alike to run the qt4 version of the tool. Then run make. Finally you might run 'make install' as root or simply copy the 'openscad' binary (OpenSCAD.app on Mac OS X) to the bin directory of your choice. - -DOCUMENTATION -============= - -Have a look at the OpenSCAD Homepage (http://openscad.org/) for documentation. +If you had problems compiling from source, raise a new issue in the [issue tracker on the github page](https://github.com/openscad/openscad/issues). -- cgit v0.10.1 From 2429d9d45acdddf963812121875c882a68b18ed8 Mon Sep 17 00:00:00 2001 From: Wil Chung Date: Mon, 7 May 2012 16:29:06 -0700 Subject: added a getting started section to the README diff --git a/README.md b/README.md index 7cb5e34..fe6fb50 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ - # What is OpenSCAD? OpenSCAD is a software for creating solid 3D CAD objects. It is free software @@ -25,6 +24,32 @@ addition to 2D paths for extrusion it is also possible to read design parameters from DXF files. Besides DXF files OpenSCAD can read and create 3D models in the STL and OFF file formats. +# Getting started + +You can download the latest binaries of OpenSCAD at . Install binaries as you would any other software. + +When you open OpenSCAD, you'll see three frames within the window. The left frame is where you'll write code to model 3D objects. The right frame is where you'll see the 3D rendering of your model. + +Let's make a tree! Type the following code into the left frame: + + cylinder(h = 30, r = 8); + +Then render the 3D model by hitting F5. Now you can see a cylinder for the trunk in our tree. Now let's add the bushy/leafy part of the tree represented by a sphere. To do so, we will union a cylinder and a sphere. + + union() { + cylinder(h = 30, r = 8); + sphere(20); + } + +But, it's not quite right! The bushy/leafy are around the base of the tree. We need to move the sphere up the z-axis. + + union() { + cylinder(h = 30, r = 8); + translate([0, 0, 40]) sphere(20); + } + +And that's it! You made your first 3D model! There are other primitive shapes that you can combine with other set operations (union, intersection, difference) and transformations (rotate, scale, translate) to make complex models! Check out all the other language features in the [OpenSCAD Manual](https://en.wikibooks.org/wiki/OpenSCAD_User_Manual). + # Documentation Have a look at the OpenSCAD Homepage (http://openscad.org/) for documentation. -- cgit v0.10.1 From a78cee15b20ca158d18229d53dfb8792d1b357e1 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Mon, 7 May 2012 21:21:01 -0400 Subject: Minor typos + line breaks diff --git a/README.md b/README.md index fe6fb50..13fba4d 100644 --- a/README.md +++ b/README.md @@ -26,29 +26,42 @@ STL and OFF file formats. # Getting started -You can download the latest binaries of OpenSCAD at . Install binaries as you would any other software. +You can download the latest binaries of OpenSCAD at +. Install binaries as you would any other +software. -When you open OpenSCAD, you'll see three frames within the window. The left frame is where you'll write code to model 3D objects. The right frame is where you'll see the 3D rendering of your model. +When you open OpenSCAD, you'll see three frames within the window. The +left frame is where you'll write code to model 3D objects. The right +frame is where you'll see the 3D rendering of your model. Let's make a tree! Type the following code into the left frame: cylinder(h = 30, r = 8); -Then render the 3D model by hitting F5. Now you can see a cylinder for the trunk in our tree. Now let's add the bushy/leafy part of the tree represented by a sphere. To do so, we will union a cylinder and a sphere. +Then render the 3D model by hitting F5. Now you can see a cylinder for +the trunk in our tree. Now let's add the bushy/leafy part of the tree +represented by a sphere. To do so, we will union a cylinder and a +sphere. union() { cylinder(h = 30, r = 8); sphere(20); } -But, it's not quite right! The bushy/leafy are around the base of the tree. We need to move the sphere up the z-axis. +But, it's not quite right! The bushy/leafy are around the base of the +tree. We need to move the sphere up the z-axis. union() { cylinder(h = 30, r = 8); translate([0, 0, 40]) sphere(20); } -And that's it! You made your first 3D model! There are other primitive shapes that you can combine with other set operations (union, intersection, difference) and transformations (rotate, scale, translate) to make complex models! Check out all the other language features in the [OpenSCAD Manual](https://en.wikibooks.org/wiki/OpenSCAD_User_Manual). +And that's it! You made your first 3D model! There are other primitive +shapes that you can combine with other set operations (union, +intersection, difference) and transformations (rotate, scale, +translate) to make complex models! Check out all the other language +features in the [OpenSCAD +Manual](https://en.wikibooks.org/wiki/OpenSCAD_User_Manual). # Documentation @@ -56,7 +69,8 @@ Have a look at the OpenSCAD Homepage (http://openscad.org/) for documentation. ## Building OpenSCAD -To build OpenSCAD from source, follow the instructions for the platform applicable to you below. +To build OpenSCAD from source, follow the instructions for the +platform applicable to you below. ### Prerequisites @@ -64,7 +78,10 @@ To build OpenSCAD, you need some libraries and tools. The version numbers in brackets specify the versions which have been used for development. Other versions may or may not work as well. -If you're using Ubuntu, you can install these libraries from aptitude. If you're using Mac, there is a build script that compiles the libraries from source. Follow the instructions for the platform you're compiling on below. +If you're using Ubuntu, you can install these libraries from +aptitude. If you're using Mac, there is a build script that compiles +the libraries from source. Follow the instructions for the platform +you're compiling on below. * [Qt4 (4.4 - 4.7)](http://www.qt.nokia.com/) * [CGAL (3.6 - 3.9)](http://www.cgal.org/) @@ -79,27 +96,35 @@ If you're using Ubuntu, you can install these libraries from aptitude. If you're * [Bison (2.4)](http://www.gnu.org/software/bison/) * [Flex (2.5.35)](http://flex.sourceforge.net/) -### Building for MacOSX +### Building for Mac OS X -First, make sure that you have XCode installed to get GCC. Then after you've cloned this git repository, run the script that sets up the environment variables. +First, make sure that you have XCode installed to get GCC. Then after +you've cloned this git repository, run the script that sets up the +environment variables. - source setenv_maju.sh + source setenv_mjau.sh Then run the script to compile all the prerequisite libraries above: ./scripts/macosx-build-dependencies.sh -We currently don't use [port](http://mxcl.github.com/homebrew/) or [brew](http://mxcl.github.com/homebrew/) to install the prerequisite libraries because CGAL doesn't exist on brew and opencsg doesn't exist on ports. And more importantly, there are some patches to GMP in the compilation process. +We currently don't use [MacPorts](http://www.macports.org) or +[brew](http://mxcl.github.com/homebrew/) to install the prerequisite +libraries because CGAL doesn't exist on brew and opencsg doesn't exist +on ports. And more importantly, there are some patches to GMP in the +compilation process. After that, follow the Compilation instructions below. ### Building for Ubuntu -If you have done this and want to contribute, fork the repo and contribute docs on how to build for windows! +If you have done this and want to contribute, fork the repo and +contribute docs on how to build for windows! ### Building for Windows -If you have done this and want to contribute, fork the repo and contribute docs on how to build for windows! +If you have done this and want to contribute, fork the repo and +contribute docs on how to build for windows! ### Compilation @@ -109,5 +134,6 @@ run 'qmake4', 'qmake-qt4' or something alike to run the qt4 version of the tool. Then run make. Finally you might run 'make install' as root or simply copy the 'openscad' binary (OpenSCAD.app on Mac OS X) to the bin directory of your choice. -If you had problems compiling from source, raise a new issue in the [issue tracker on the github page](https://github.com/openscad/openscad/issues). +If you had problems compiling from source, raise a new issue in the +[issue tracker on the github page](https://github.com/openscad/openscad/issues). -- cgit v0.10.1 From a1ff48eef91a6fec285b54595a1abc45215781cd Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Tue, 3 Apr 2012 01:37:28 +0200 Subject: Fixes to make CGAL-4.0 link correctly on Mac diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 1ce3103..48f907e 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -65,13 +65,19 @@ build_gmp() mkdir -p lib if $OPTION_32BIT; then lipo -create i386/lib/libgmp.dylib x86_64/lib/libgmp.dylib -output lib/libgmp.dylib + lipo -create i386/lib/libgmpxx.dylib x86_64/lib/libgmpxx.dylib -output lib/libgmpxx.dylib else cp x86_64/lib/libgmp.dylib lib/libgmp.dylib + cp x86_64/lib/libgmpxx.dylib lib/libgmpxx.dylib fi install_name_tool -id $DEPLOYDIR/lib/libgmp.dylib lib/libgmp.dylib + install_name_tool -id $DEPLOYDIR/lib/libgmpxx.dylib lib/libgmpxx.dylib + install_name_tool -change $DEPLOYDIR/x86_64/lib/libgmp.10.dylib $DEPLOYDIR/lib/libgmp.dylib lib/libgmpxx.dylib if $OPTION_32BIT; then cp lib/libgmp.dylib i386/lib/ cp lib/libgmp.dylib x86_64/lib/ + cp lib/libgmpxx.dylib i386/lib/ + cp lib/libgmpxx.dylib x86_64/lib/ fi mkdir -p include cp x86_64/include/gmp.h include/ @@ -204,9 +210,12 @@ build_cgal() CGAL_EXTRA_FLAGS=";i386" fi # We build a static lib. Not really necessary, but it's well tested. - cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DGMP_INCLUDE_DIR=$DEPLOYDIR/include -DGMP_LIBRARIES=$DEPLOYDIR/lib/libgmp.dylib -DGMPXX_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_LIBRARIES=$DEPLOYDIR/lib/libmpfr.dylib -DWITH_CGAL_Qt3=OFF -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DBUILD_SHARED_LIBS=FALSE -DCMAKE_OSX_DEPLOYMENT_TARGET="$MAC_OSX_VERSION_MIN" -DCMAKE_OSX_ARCHITECTURES="x86_64$CGAL_EXTRA_FLAGS" -DBOOST_ROOT=$DEPLOYDIR + cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DGMP_INCLUDE_DIR=$DEPLOYDIR/include -DGMP_LIBRARIES=$DEPLOYDIR/lib/libgmp.dylib -DGMPXX_LIBRARIES=$DEPLOYDIR/lib/libgmpxx.dylib -DGMPXX_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_INCLUDE_DIR=$DEPLOYDIR/include -DMPFR_LIBRARIES=$DEPLOYDIR/lib/libmpfr.dylib -DWITH_CGAL_Qt3=OFF -DWITH_CGAL_Qt4=OFF -DWITH_CGAL_ImageIO=OFF -DBUILD_SHARED_LIBS=TRUE -DCMAKE_OSX_DEPLOYMENT_TARGET="$MAC_OSX_VERSION_MIN" -DCMAKE_OSX_ARCHITECTURES="x86_64$CGAL_EXTRA_FLAGS" -DBOOST_ROOT=$DEPLOYDIR -DCMAKE_BUILD_TYPE=Debug make -j4 make install + install_name_tool -id $DEPLOYDIR/lib/libCGAL.dylib $DEPLOYDIR/lib/libCGAL.dylib + install_name_tool -id $DEPLOYDIR/lib/libCGAL_Core.dylib $DEPLOYDIR/lib/libCGAL_Core.dylib + install_name_tool -change $PWD/lib/libCGAL.9.dylib $DEPLOYDIR/lib/libCGAL.dylib $DEPLOYDIR/lib/libCGAL_Core.dylib } build_glew() -- cgit v0.10.1 From db2d5b3177c79a082722c488576ddc3812524c4d Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 9 May 2012 11:12:24 -0400 Subject: Bumped gmp to 5.0.5 diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 48f907e..1436ac2 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -296,7 +296,7 @@ done echo "Using basedir:" $BASEDIR mkdir -p $SRCDIR $DEPLOYDIR build_eigen 2.0.17 -build_gmp 5.0.4 +build_gmp 5.0.5 build_mpfr 3.1.0 build_boost 1.47.0 # NB! For CGAL, also update the actual download URL in the function -- cgit v0.10.1 From 18529d2f78873972917741aeb8d3c981665d213e Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 9 May 2012 13:21:47 -0400 Subject: Build mpfr with the latest official patches diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 1436ac2..405f7aa 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -133,7 +133,8 @@ build_mpfr() fi tar xjf mpfr-$version.tar.bz2 cd mpfr-$version - + curl -O http://www.mpfr.org/mpfr-current/allpatches + patch -N -Z -p1 < allpatches if $OPTION_32BIT; then mkdir build-i386 cd build-i386 -- cgit v0.10.1 From 67eb2ebe90447e966dc1e08b91c43d937c521583 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 9 May 2012 13:25:28 -0400 Subject: sync diff --git a/doc/TODO.txt b/doc/TODO.txt index 8fc9be8..7f8378d 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -73,6 +73,7 @@ o 3D View - 2D objects are rendered at z = -0.1 - why? - Rewrite to use VBOs or smth. - avoid inline calculations - Rewrite to a higher-level library (e.g. OSG)? + - Make navigation (e.g. zoom) available through menu entries (requested by disabled user) o Editor wishlist - More infrastructure for external editor (allow communication from the outside) - Preferences GUI for the features below @@ -93,12 +94,14 @@ o Editor wishlist - Auto-indent on enter and on tab o Error reporting/debugging - Provide better error messages when polygon ordering causes CGAL errors: + o Detect common error: self-intersecting polyhedron() o Supply syntax highlighting of the exact polygon indices which are reported to be wrong o Provide some interaction for debug walk-through? - Provide visual highlighting of geometry corresponding to code -> could aid debugging a lot - Optionally output console log to a file + - Common error: detect and report (and ignore?) duplicate line segments in DXF o Computation - Multi-threaded computation (mostly important for CGAL) - Progress: Call progresswidget more often to improve feedback -- cgit v0.10.1