jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5864 commits 74 branches 13 tags 46 MiB
Commit graph

381 commits

Author SHA1 Message Date
Marius Kintel
f3aee4df91 Merge remote-tracking branch 'origin/master' into opengl-display-lists 2016-01-04 00:59:54 -05:00
Marius Kintel
ab338a2c20 Green refactoring: Split export into separate files 2015-12-26 23:06:18 -05:00
Marius Kintel
77ae07db7a #1527 Green refactoring: Renamed some classes, cleaned up some member visibility and redundant copying 2015-12-25 21:45:15 -05:00
Marius Kintel
4af8cc7525 Introduce a USE_QOPENGLWIDGET define, added qopenglwidget CONFIG to qmake 2015-12-02 13:24:18 -05:00
Don
b9ff5fc5a7 allow shared library cross-build under MXE 2015-11-01 21:26:48 -05:00
Giles Bathgate
5a3d81d553 QGLView requires glew regardless of whether opencsg is used. 2015-10-23 23:02:02 +01:00
Marius Kintel
9a113b9407 Merge branch 'master' of github.com:openscad/openscad 2015-06-19 18:20:49 -04:00
Marius Kintel
058330b0ad Merge branch 'chrysn/drop-openscadtesting' of https://github.com/chrysn-pull-requests/openscad 2015-06-19 16:52:55 -04:00
chrysn
1b30f641ad pack OPENSCAD_NOGUI in qmake nogui config 
thus, scintilla can be kept from being built at all, slimming down the
build dependencies for the nogui build
 2015-06-08 09:58:38 +02:00
Don Bright
4db4aa5563 prevent gcc crash on systems w 2GB RAM, by splitting cgalutils 2015-06-01 23:18:22 -04:00
Don Bright
0a2556304f split cgalutils to reduce gcc RAM usage. fix fedora deps. fix warnings 2015-06-01 21:43:27 -04:00
Marius Kintel
a209035a83 Bumped version to 2015.03-1 2015-04-21 10:41:44 -04:00
ankush1995
7e5394c6fa separate-compile 2015-04-15 14:56:19 +05:30
Marius Kintel
c5e1e2b9af Merge remote-tracking branch 'origin/master' into c++11 2015-03-20 17:00:41 -04:00
Marius Kintel
c037625b65 Disable c++11 as default for now 2015-03-20 17:00:05 -04:00
Marius Kintel
21cce232bc #1203 Explicitly set icon to make sure windows systems correctly set up the icon 2015-03-20 00:40:55 -04:00
Marius Kintel
9660ba84a0 Merge remote-tracking branch 'origin/master' into c++11 2015-03-14 15:46:49 -04:00
Torsten Paul
d2666c80ef Activate special icon for nightly builds (using SUFFIX=-nightly). 2015-03-13 00:08:26 +01:00
Marius Kintel
394cc15fba Merge remote-tracking branch 'origin/master' into c++11 2015-03-10 22:08:06 -04:00
Marius Kintel
26e5684d08 Enable nightly icon for Mac 2015-03-10 17:17:21 -04:00
Marius Kintel
ca72a5ab5d Reverted version to master after release 2015-03-10 10:46:46 -04:00
Marius Kintel
a7bf4fe69b Bumped version to 2015.03 2015-03-10 10:45:40 -04:00
Marius Kintel
9a223a5df0 Updated version variable info 2015-03-05 15:44:06 -05:00
Marius Kintel
43c500f0b8 Refactor: Moved _DxfData contents to main cc file as it's no longer related to dxfdata 2015-03-02 14:47:28 -05:00
Marius Kintel
6576ee7d05 Merge remote-tracking branch 'origin/master' into c++11 2015-02-10 16:42:48 -05:00
Marius Kintel
1c52fad1d3 Moved libtess2-based tessellation to GeometryUtils, related refactoring 2015-01-15 14:47:05 -05:00
Marius Kintel
4b60231d3b Merge branch 'master' into libtess2 2015-01-13 13:14:51 -05:00
Marius Kintel
df2dae4e59 Added new tessellator using libtess2 instead of CGAL 2015-01-13 13:14:09 -05:00
Torsten Paul
13ba427bb4 Extend Windows version detection (fixes #1076). 
As GetVersionEx() is deprecated and will not report Windows 8.1 without
additional resource file manipulation this is now using the code from
http://hg.m1xa.com/findversion (by M1xA / MIT license) which is using the
VerifyVersionInfo API.
 2015-01-09 02:00:33 +01:00
Marius Kintel
31f42ee81d Merge remote-tracking branch 'origin/master' into gridfix 
Conflicts:
	src/cgalutils.cc
 2015-01-06 12:44:17 -05:00
Marius Kintel
82dbabac92 Apply convex hull bugfix from CGAL, work around next issue by avoiding using std::set iterators, updated test cases. Fixes #1089 2015-01-06 11:12:03 -05:00
Marius Kintel
a41c8716ec Merge remote-tracking branch 'origin/master' into c++11 
Conflicts:
	openscad.pro
 2015-01-06 01:10:04 -05:00
Marius Kintel
32b2d2ec97 Fixed buggy vertex quantizing and polygon tessellation. Should improve some corner cases 2015-01-05 18:22:58 -05:00
Marius Kintel
4eaf8797c2 Small refactoring: Split out Polyhedron-related functions to from cgalutils.cc to cgalutils-polyhedron.cc 2014-12-31 02:52:56 -05:00
Torsten Paul
dde4575c88 Add class to handle settings. 2014-12-27 00:12:23 +01:00
Marius Kintel
0007684c5b Merge pull request #1077 from openscad/winconsole-fix 
Use separate project for winconsole and don't statically link Qt
 2014-12-23 00:32:15 -05:00
Torsten Paul
c4e895a813 Add drag&drop to the FontListDialog. 2014-12-23 03:07:27 +01:00
Torsten Paul
98a9ea7e12 Use QtConcurrentRun to initialize FontConfig in a separate thread. 2014-12-21 03:49:20 +01:00
Torsten Paul
abdf80c494 Revert usage of the -Wa,-mbig-obj flag as that does not work on MXE. 2014-12-20 23:28:51 +01:00
Torsten Paul
7d863d2bf2 Updates to build on MSYS2. 2014-12-20 23:09:03 +01:00
Torsten Paul
4a75c57209 Move -DNOGDI to main project file. 
This is not related to the cross build but a workaround when including
windows.h that also defines Polygon. So it's now enabled for all Windows
builds including MSYS2.
 2014-12-20 21:46:30 +01:00
Torsten Paul
1126a0ef17 Use separate project for winconsole and don't statically link Qt (fixes #870). 2014-12-16 23:35:42 +01:00
Torsten Paul
ba8446e8bf Remove qtaccessiblewidgets as QTPLUGIN. 
MXE now ships Qt-5.4.0-rc which has accessibility built-in. All other
platforms did not have it enabled so far.
 2014-12-09 22:21:07 +01:00
Torsten Paul
399895bbfe Fix translation file install target when running qmake on clean source. 2014-12-07 05:46:07 +01:00
Torsten Paul
771526b5ae Fix install target for translation files. 2014-12-07 03:39:01 +01:00
Torsten Paul
04c194f6d6 Update .desktop file to include the install SUFFIX. 2014-12-07 03:38:02 +01:00
Torsten Paul
dcd0f23277 Fix make install with INSTALL_ROOT set, e.g. used by Debian package build. 2014-12-06 21:31:37 +01:00
Torsten Paul
2f4171f506 Add optional target suffix for the binary / installation folder. 
This is mainly intended to be used for building snapshot binaries that
are able to install in parallel to a release build. E.g. by using the
parameter "SUFFIX=-nightly" for qmake, the target binary will be called
openscad-nightly and the resource base folder /usr/share/openscad-nightly.
 2014-12-06 19:23:19 +01:00
Torsten Paul
80f1a31143 Update translation file generator scripts. 2014-12-04 23:20:25 +01:00
Torsten Paul
a466638433 Remove automatic translation update as that always generates modified *.po files. 2014-12-04 20:52:07 +01:00