Commit Graph

370 Commits (master)

Author SHA1 Message Date
Oskar Linde c5bc92d97c Mac: Automate build with libc++ when not using OPENSCAD_LIBRARIES
Conflicts:
	openscad.pro
2014-06-08 01:27:44 +02:00
Marius Kintel 2eb96a2a88 Build as c++11. On Mac, build as c++11 if as libc++-linked boost exists 2014-06-07 17:48:42 -04:00
shaina 950ffe9722 layout problem of editor is solved 2014-06-07 17:43:52 +02:00
Marius Kintel 22e884d08f Quick and dirty fixup 2014-06-07 17:43:52 +02:00
shaina 59a71b7e6e added scintilla editor classes 2014-06-07 17:43:52 +02:00
shaina 5a0df4e6d9 legacyeditor 2014-06-07 17:43:46 +02:00
Marius Kintel 2cf6dcacf2 Merge branch 'master' into c++11 2014-06-05 19:18:33 -04:00
Marius Kintel 2cba2a1b55 Merge branch 'master' into text-module
Conflicts:
	scripts/macosx-build-homebrew.sh
	scripts/mingw-x-build-dependencies.sh
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh
	src/GeometryEvaluator.h
	src/MainWindow.ui
	src/clipper-utils.h
	src/mainwin.cc
	tests/CMakeLists.txt
2014-04-26 22:08:31 -04:00
Marius Kintel b2b3306205 Merge branch 'master' into c++11 2014-04-25 02:29:40 -04:00
Marius Kintel 9613e992da Suppress unused local typedef warning for gcc. Fixes #757 2014-04-24 00:01:42 -04:00
Don Bright 1ecf715476 add mime-type under linux during make install ( issue #696 ) 2014-04-02 18:16:31 -05:00
Torsten Paul 49dc984bef Add offset() module to inset/outset polygons using Clipper (fixes #483). 2014-03-30 23:41:37 +02:00
Marius Kintel 19de4c9d15 Merge branch 'master' into unstable 2014-03-10 10:42:53 -04:00
Marius Kintel e54d0cca6e Moved MACOSX_DEPLOYMENT_TARGET to the deploy script to allow building against the current system 2014-03-03 21:32:52 -05:00
Marius Kintel d6340b18db Merge branch 'master' into c++11 2014-03-03 21:04:27 -05:00
Marius Kintel ab6192e465 Merge branch 'master' into unstable
Conflicts:
	src/openscad.cc
	src/printutils.h
2014-03-02 22:41:05 -05:00
Marius Kintel 1d211498c6 Added note to encourage people to build with experimental features enabled 2014-03-01 15:11:52 -05:00
Don Bright afcf7239ab fix broken linux gui build!! 2014-02-26 18:29:57 -06:00
Don Bright 36e0d73e69 enable qtaccessibility plugin so that screenreading of QAction menu works
(tested on Jaws screenreader demo on Windows 7, per bug report to mailing list
by Robert Jaquiss 2/25/2014)
2014-02-25 20:20:14 -06:00
Marius Kintel 3ac8895d7a Enable experimental features only for snapshot builds 2014-02-23 15:47:26 -05:00
Jan Huwald 086f231d5a fix typo 2014-02-21 12:21:38 +01:00
Jan Huwald c259e5275c compile with -std=c++0x to support older C++11 compilers 2014-02-21 09:22:39 +01:00
Marius Kintel 34333941d3 Merge branch 'master' into unstable 2014-02-05 01:08:44 -05:00
Marius Kintel b80c6c7bf4 Qt5 qmake needs explicit includpath 2014-02-04 01:21:35 -05:00
Torsten Paul 284a93972a Add dialog to show all registered fonts. 2014-02-02 18:01:08 -05:00
Torsten Paul 8bb32da1c4 Add libraries to qmake config. 2014-02-02 18:00:44 -05:00
Torsten Paul bb45e7e52a Add implementation of text() module. 2014-02-02 18:00:44 -05:00
Marius Kintel 24986eec91 Added Geometry::isEmpty, some cleanups of CGAL_Nef_polyhedron, fixed some 2D-3D-mix issues 2014-01-09 02:06:37 -05:00
Marius Kintel 0c65fec41a Added a separate component for dealing with vertex reindexing 2014-01-09 02:06:37 -05:00
Marius Kintel ace3668736 Cleanup: Removed redundant code 2014-01-09 02:06:35 -05:00
Marius Kintel dc9429acac Use GeometryEvaluator instead of CGALEvaluator. A bunch of refactoring and fixes as a result of that. Renamed GUI menu items to reflect preview vs. render 2014-01-09 02:06:35 -05:00
Marius Kintel 1ef92f55f2 Clipper is bundled 2014-01-09 02:06:34 -05:00
Marius Kintel 1f488f851d Refactoring to facilitate more sharing of code between CGALEvaluator, GeometryEvaluator and CGALUtils 2014-01-09 02:06:34 -05:00
Marius Kintel af59b1983c Implemented non-cut projection using ClipperLib. Upgraded ClipperLib to V6 2014-01-09 02:06:33 -05:00
Marius Kintel b8c15cfb8a Preliminary large refactoring: Created GeometryEvaluator as a replacement for PolySetEvaluator. Use ClipperLib for 2D CSG (first baby steps). This design is far from perfect but sacrifice design for staying in the green. This version is broken, but can render primitives. 2014-01-09 02:06:32 -05:00
Marius Kintel acd08b6f1a Green refactoring, but uncertain if we should keep it 2014-01-09 02:06:32 -05:00
Marius Kintel 62b9746ab1 Mac fixes: Moved sparkle config to sparkle.pri. Link with ApplicationServices 2014-01-04 18:03:33 -05:00
Marius Kintel bee5233a91 Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat
Conflicts:
	src/Preferences.ui
2014-01-03 13:17:58 -05:00
Torsten Paul 72865e17da Add feature registry. 2014-01-02 23:27:52 +01:00
Torsten Paul b49f51dab3 Moved get_fragments_from_r into Calc 2013-12-27 17:48:15 -05:00
Miro Hrončok 90edc3b5f7 `make install` installs manpage and appdata file 2013-12-24 02:11:20 +01:00
Brody Kenrick 0717c67c9f Unicode support for strings
Add suport for using unicode strings in .scad files. Support iterating
across them/accessing them via [] and searching.
--------
Add GLIB (to build for test and normal build -- both with installed and
built locally development files).
Add support for unicode chars to length and search builtin functions and
[] for strings.
Added unicode testing functions.
Ad GLIB to library info page.
2013-12-05 18:28:40 +11:00
Don Bright cf9f19818c prevent crash in CGAL nef3. fix #issue 410 . also deal w qmake bug re .h files 2013-11-26 20:04:57 -06:00
Don Bright 49af42cfd0 a few fixes for netbsd 2013-06-08 23:49:21 -05:00
Don Bright 31c88a434b merge branch to get windows "library path" working. tweak build system,
eliminate several compiler warnings.
2013-05-25 22:37:26 -05:00
Marius Kintel 13e4bcd50e Added meny entry for disclosing the library path. Part of #125 2013-05-21 18:02:16 -04:00
Marius Kintel e2772c70b8 Initial Windows implementation of built-in library path. Part of #125 2013-05-21 17:45:24 -04:00
Marius Kintel b5079a189a wops, duplicate parser files 2013-05-10 00:55:04 +02:00
Marius Kintel 7a8b6f5c51 Put back lex/yacc - we're not using any bison-specific stuff after all 2013-05-09 18:48:27 +02:00
Marius Kintel 14e1ad2363 Forgot to actually add most files in previous commit (#217) 2013-05-09 12:12:58 +02:00
Marius Kintel ba20c0e800 Modified parse to allow overloading of variables in local blocks. Also did some minor cleanups while at it. Test cases missing 2013-04-26 18:32:19 -04:00
Marius Kintel 9b740b558d Further refactoring of scope/context mechanisms. Mostly related to the new FileContext class. Not quite there yet, but almost 2013-04-26 17:45:03 -04:00
Marius Kintel 58bd9c9e3f Cleaned up argument list handling, related to #116 2013-04-18 18:34:14 -04:00
Marius Kintel 49a288cd34 Merge branch 'noqt' into testing 2013-04-10 14:28:51 -04:00
Marius Kintel a37813a899 Refactored context handling into using separate Module contexts and Eval contexts. This allows for recursive module calls, and cascading children. I believe this fixes issue #116 2013-04-09 00:28:16 -04:00
Marius Kintel dccc039211 Got rid of remaining Qt dependencies. The test framework should now be Qt-free 2013-03-12 01:14:58 -04:00
Marius Kintel a1308a6a5e Merge branch 'master' of github.com:openscad/openscad
Conflicts:
	openscad.pro
2013-03-11 10:20:40 -04:00
Marius Kintel 20b2a709f9 Somehow MACOSX_DEPLOYMENT_TARGET cannot be lower then 10.6 without developing on old boxes 2013-03-11 10:19:27 -04:00
Marius Kintel 8711bd2500 Set preprocessor define for deployment builds. Don't include sparkle in development builds. Note: Development snapshots are considered deployment builds 2013-03-09 13:04:36 -05:00
don bright 1221b66edb use pkgconfig for eigen + fix mingw builds 2013-03-08 20:07:40 -06:00
don bright 13b0fe4b3f rework Camera using boost::variant. first working --gimbalcam version 2013-02-27 00:37:37 -06:00
don bright 707118ce94 move enable_opencsg_shaders, fix indenting, split out display_opencsg_warning
also update docs, and try to make enable_opencsg_shaders the same between
qgl and offscreengl
2013-02-24 11:21:45 -06:00
don bright 91896e0d96 tweaks for mergeing master 2013-02-23 21:55:16 -06:00
don bright ca41979ee5 Merge branch 'master' of github.com:openscad/openscad into issue11_2
Conflicts:
	RELEASE_NOTES
	openscad.pro
	src/mainwin.cc
2013-02-23 21:54:53 -06:00
don bright 0f977609b4 put qglview.h into mainwin for deps. unify camera functions into glview.
remove duplicate code.
2013-02-23 18:50:20 -06:00
don bright 5389107aa6 create GLView as parent of OffscreenView and QGLView. combine setRenderer() 2013-02-23 15:34:06 -06:00
don bright fc2d9341fa begin process of unifying GLView and OffscreenView. renames, objrot, objtran 2013-02-20 19:56:30 -06:00
don bright 09edcdf822 fix build errors, display 'not implemented' message on win32/linux 2013-02-17 04:48:30 +01:00
Marius Kintel b87e574e09 Added document icon for Mac 2013-02-11 21:50:53 -05:00
Marius Kintel f3731d8ce1 Added support for signing binaries 2013-02-11 21:44:48 -05:00
Marius Kintel 4bd23c9091 Support Sparkle's Install on Quit 2013-02-07 15:01:31 -05:00
Marius Kintel fa00547507 First version of automatic updates for Mac 2013-02-05 00:36:25 -05:00
don bright 997a0afac3 Merge branch 'master' and fix bugs
Conflicts:
	src/openscad.cc
	tests/CMakeLists.txt
2013-01-31 03:58:34 +01:00
Marius Kintel 256eb2c2f2 Mac OS X build fixes 2013-01-28 14:56:17 -05:00
don bright d4c15a8fc4 fixups for mingw32 cross compilation 2013-01-26 21:19:42 +01:00
don bright c116a0849c undo experiment with object orientation 2013-01-26 01:36:55 +01:00
don bright 2d59f7acf6 move png export to sep file to make compilation time bearable. expand stubs. 2013-01-24 04:35:04 +01:00
don bright cf32594c9e add lodepng.cpp, fix compiler warnings, fix qmake buildfile 2013-01-24 04:13:45 +01:00
don bright 009baca904 move imageutils platform stuff to qmake build file mv system-gl. fix gcc warning 2013-01-24 04:10:24 +01:00
don bright 1bec7aad09 modify qmake buildfile, move offscreen rendering to main src directory 2013-01-24 04:01:34 +01:00
don bright 1af090c7b3 add wrapper code from nop head, mod build scripts 2013-01-21 14:25:14 +01:00
don bright 70d810b666 cleanup 2012-12-29 17:14:13 -06:00
don bright b753e41dea cleaning up 2012-12-29 17:13:16 -06:00
don bright ed97940f56 make RPATH work on uni-build-dependencies with GLEW on 64 bit machines 2012-12-29 22:27:44 +01:00
don bright 7afcc417b3 prevent LD_LIBRARY_PATH problems on unix (not OSX) systems with
dependency builds, by using RPATH during build. remove the shell script
workaround that was added during the previous commit, as it is 'less
clean' a solution.
2012-12-29 14:26:59 -06:00
don bright ad45e8a8c5 detect netbsd / freebsd after linux not before, for bison/flex. 2012-12-23 17:14:58 -06:00
don bright f3cd856282 netbsd fixes 2012-12-23 01:00:48 +01:00
don bright 4ecd9fa8a4 refactor, cleanup, put code where it belongs, make simple logging class 2012-10-28 08:56:23 -05:00
Marius Kintel 51b83ff8dd bugfix: There is a bug in the stdc++ library on Mac OS 10.5 which messes up some STL templates. This should fix it, courtesy of http://stackoverflow.com/questions/3484043/os-x-program-runs-on-dev-machine-crashing-horribly-on-others 2012-08-22 00:22:35 -04:00
don bright 5d31f56d93 look for EIGENDIR env var. (also look for EIGEN2DIR for backwards compatability) 2012-08-19 08:10:33 -05:00
don bright c4d68588a6 modify build system to auto-detect eigen3, and fallback to eigen2 2012-08-19 00:14:17 +02:00
don bright 9f6819e685 initial rework to enable eigen3 per issue #174.
1. enable eigen3 in qmake build system
2. convert Transform3d and cwise() per the eigen2->eigen3 porting faq online
3. get rid of 'using namespace boost::filesystem' as it conflicts with eigen3
2012-08-18 22:28:36 +02:00
don bright 4cc87c32f4 Add info to 'about' window with acknowledgements, etc. 2012-08-04 11:49:45 -05:00
don bright b22951af47 enable build of glew + opencsg with clang from script 2012-07-20 15:51:40 -05:00
don bright dec26f84dd initial steps towards support of clang compiler 2012-07-20 15:23:16 -05:00
Marius Kintel 3267ba2d56 Merge pull request #146 from openscad/mingwcross1
Mingwcross1
2012-07-16 18:55:31 -07:00
don bright 9123ad8d5e fix build bug on some DSO linux systems 2012-07-15 18:13:50 -05:00
don bright be9c424a15 cleanup 2012-07-15 22:13:20 +02:00
don bright 06420a3ef9 fix documentation 2012-07-15 22:11:04 +02:00
don bright cd81cecc3a put .o files of cross into separate directory. handle git issue. 2012-07-15 18:47:18 +02:00
don bright 018211a863 check versions of libraries at compile time - warn users. fix FIXME in openscad.pro 2012-07-13 03:40:07 +02:00
don bright c2f19f450b more reliable way of ensuring GLU is linked on new DSO linux systems. 2012-06-03 16:16:40 +02:00
Marius Kintel b9d218e137 Initial implementation of ModuleCache and dependency tracking of used modules 2012-02-15 01:32:37 +01:00
Marius Kintel 23f6b0623c Merge branch 'master' into threading
Conflicts:
	RELEASE_NOTES
2012-01-09 03:29:24 +01:00
Marius Kintel 3c18145b13 Merge branch 'master' into boost_filesystem 2012-01-08 19:14:30 +01:00
Marius Kintel 9495f11be0 Added Linux desktop icon and .desktop file from chrysn 2012-01-05 00:00:29 +01:00
Marius Kintel 52dfffd97b Merge branch 'master' into threading
Conflicts:
	RELEASE_NOTES
2012-01-04 23:29:08 +01:00
Marius Kintel fdce8d15fc Merge branch 'master' into boost_filesystem
Conflicts:
	boost.pri
	src/lexer.l
	tests/CMakeLists.txt
2012-01-04 23:07:32 +01:00
don bright 277c762912 changes to enable building on NetBSD 2012-01-03 18:21:28 +01:00
Marius Kintel bc3454f369 Refactored normalization into a separate class, hard-limited normalization to stop at 5000 nodes to keep from normalizing 'forever' 2011-12-26 19:15:51 +01:00
Marius Kintel 0be212e75d Merge branch 'master' into threading 2011-12-26 16:38:11 +01:00
Marius Kintel cbabbaed70 Merge branch 'master' into boost_filesystem
Conflicts:
	openscad.pro
	src/module.h
2011-12-26 16:37:00 +01:00
Marius Kintel 4ff2d1af44 Some light refactoring attempts, didn't get very far.. 2011-12-26 16:34:47 +01:00
Marius Kintel 7c48b345b1 Perform CGAL evaluation in a separate thread. First steps towards better GUI responsiveness and parallelization 2011-12-25 23:00:30 +01:00
Marius Kintel 0ab51d2d23 Extracted librarydir initialization to separate function 2011-12-24 22:02:37 +01:00
Marius Kintel 9fa18d5392 Fixed CSG regression reported by Ed Nisley; bounding boxes are now transformed correctly 2011-12-23 14:33:40 +01:00
Don Bright 52655b3b5f -fno-strict-aliasing fix for GCC bug & link to wikibooks build instructions. 2011-12-17 13:17:11 -06:00
Don Bright a7ebe94199 fix qmake under mingw-cross-compile 2011-12-16 21:03:10 -06:00
don 609e59d4cc fix OPENSCAD_LIBRARIES on FreeBSD 2011-12-17 01:56:24 -06:00
don bright b6a01a76b9 fix compilation on Fedora: boost, flex, and OPENSCAD_LIBRARIES 2011-12-16 17:33:31 -08:00
don b8be38ce8b improve OPENSCAD_LIBRARIES for freebsd 2011-12-16 21:51:42 -06:00
Marius Kintel 6aa1a6d4c8 Some more build system cleaning 2011-12-15 05:17:04 +01:00
Marius Kintel b74bb392af generalized MACOSX_DEPLOY_DIR into the platform-independent OPENSCAD_LIBRARIES 2011-12-15 04:59:15 +01:00
Marius Kintel d61b274dad Started documenting env. variables 2011-12-13 01:22:33 +01:00
Marius Kintel 9ed8d9a673 Some small refactoring of color handling to support using the color() module to change only alpha 2011-12-11 23:45:14 +01:00
Marius Kintel f577f91d25 Better warnings and GL info related to OpenCSG capabilities and OpenGL 1.x 2011-12-09 03:43:06 +01:00
Marius Kintel 679b8d05c8 bugfix: 2D hull() now works with for loops. Thanks to nophead to reasserting this bug. 2011-12-07 05:21:11 +01:00
Marius Kintel 96c480b1bd Ported QCache and related code away from Qt 2011-11-09 03:18:32 +01:00
Marius Kintel ee7603badb Compile DEBUG builds with -DDEBUG 2011-11-08 03:37:43 +01:00
don bright 8baead275a Merge remote-tracking branch 'upstream/master' 2011-11-06 10:19:09 -08:00
Marius Kintel 45161d4356 Slight refactoring of builtin function and module handling 2011-11-06 18:37:12 +01:00
don bright 9ab95e6d72 provide helpful error message when 'qmake' for qt3 is run 2011-11-06 14:28:35 +01:00
Marius Kintel 3bc0371351 Applied configurable PREFIX patch from chrysn 2011-11-03 15:13:33 +01:00
Marius Kintel 696c061eec extracted version config to separate .pri file 2011-10-30 02:15:25 +01:00
Don Bright 5f58255bcf integrate Brad Pitcher's cross compile linux->win32-mingw qmake stuff 2011-10-25 19:10:28 -05:00
don bright 36895ff2e5 confine date detection to win32-msvc, set VERSION, hide debug message 2011-10-24 21:47:22 -05:00
don bright 82ff5a12ec fdef getopt.h for MSVC, cleanup makefile, ignore another msvc warning 2011-10-23 22:41:03 -05:00
don bright 9afee60563 auto detect date in windows qmake 2011-10-23 20:14:35 -05:00
don b534f40aa0 eigen align tweak 2011-10-21 01:49:34 +00:00
User 98530546c9 fix freebsd build 2011-10-20 06:49:52 -05:00
don b 1a1ab5b5ab improve freebsd build. also remove windows unicode preamble from .cc 2011-10-17 23:16:02 -05:00
Marius Kintel b12b086175 cleanup: use -DEIGEN_DONT_ALIGN for all except Mac 2011-10-16 18:56:08 +02:00
Don Bright 7332ec9fe2 clean up linux changes to fit with win32 changes. 2011-10-15 20:14:35 -05:00
don bright 17ccbace5f improve documentation. move EIGEN_DONT_ALIGN to makefile. win32 build fixes. 2011-10-15 15:48:41 -05:00
don bright 31592577d3 enable building of opencsgtest, throwntogethertest, on WinXP 2011-10-10 21:46:27 -05:00
don bright a1c698f422 enable build of cgalpngtest under windowsXP 2011-10-10 18:01:51 -05:00
Marius Kintel 2f239205a8 Redefined version() to return the version as a vector. Added version_num() to return a comparable number 2011-10-04 00:09:04 +02:00
Marius Kintel 84e98b178a Cleaned up some unnecessary includes 2011-10-01 01:36:30 +02:00
Marius Kintel bf3fb9634c Renamed some files and classnames for clarification 2011-09-30 03:11:28 +02:00
Marius Kintel 1f52da35ef helper to include TR1 stuff 2011-09-11 11:10:48 +02:00