Commit Graph

3979 Commits (a9f9fb342adbb6dc54b446429da67144e06c4675)

Author SHA1 Message Date
Don Bright 590711aa26 fix build problem under qt5 2014-03-28 14:01:14 -05:00
Don Bright 265c3abcae fix compiler warning 2014-03-28 12:50:44 -05:00
Don Bright 37b0ad1ec9 enable qt5 mxe mingw cross build 2014-03-28 12:36:14 -05:00
Don Bright e6a33b3b2b build qt5 in addition to qt4 under MXE cross build 2014-03-28 12:30:45 -05:00
Don Bright 0d9b20dc14 Merge branch 'unstable' of github.com:openscad/openscad into unstable
Conflicts:
	scripts/builder.sh
2014-03-27 18:30:09 -05:00
Don Bright 41c7e72ca8 no longer suggest the 'time saver' cgal/opencsg dep build, to avoid confusion
with outdated cgal versions on systems.
2014-03-27 18:28:40 -05:00
Don Bright 49d32100df fix eigen3 find bug 2014-03-27 18:23:07 -05:00
Don Bright 45ef0c9a6e remove eigen2 checks per patch from @fcbsd to master branch 2014-03-27 18:18:38 -05:00
Don Bright 819c74d8ab rate limit scp upload 2014-03-27 18:16:41 -05:00
Don Bright a040be29e6 loop - improve sleep code 2014-03-27 18:14:06 -05:00
Don Bright f80fc6c78b fix loop bug 2014-03-25 22:10:04 -05:00
Don Bright 74b0cb5127 enable looping 2014-03-25 22:01:31 -05:00
Don Bright 46c0a8520d exit if missing nsis. do git fetch/git pull if openscad already checked out. 2014-03-25 16:49:38 -05:00
Don Bright fc665d0b3a check for nsis at beginning of builder.sh not in the middle 2014-03-24 22:14:26 -05:00
Don Bright d23a4664b1 Merge branch 'unstable' of github.com:openscad/openscad into unstable 2014-03-23 21:54:06 -05:00
Don Bright c950358b86 better ssh auth sock handling 2014-03-23 21:53:38 -05:00
don bright 7a871202f3 better printing of glib2 include dirs 2014-03-24 03:28:34 +01:00
Don Bright 3e22f8aa4d debug message 2014-03-23 21:22:45 -05:00
don bright 424dc86cc6 better glib detection (again) 2014-03-24 03:20:28 +01:00
Don Bright fc78dedfe8 debugging output 2014-03-23 21:14:28 -05:00
Don Bright 6b1079b7b7 better glib2 detection 2014-03-23 21:12:01 -05:00
Don Bright 1473cf41ac fix cmake version detection 2014-03-23 20:28:26 -05:00
Don Bright d3d1fc72da Merge branch 'unstable' of github.com:openscad/openscad into unstable
Conflicts:
	scripts/uni-build-dependencies.sh
2014-03-23 20:26:59 -05:00
don bright 8176b4ce27 fix build on gcc 4.5 (typedef typename is c++0x) 2014-03-24 02:00:42 +01:00
don bright 03d62f8242 fix build gcc 4.5 (CGAL ENABLE during DEBUG of Geometry Cache) 2014-03-24 01:46:02 +01:00
don bright de0201ad93 undo nef poly 'fix', wasnt a fix 2014-03-24 01:41:53 +01:00
don bright 36eb6758b0 tweak pkg-config detection. also fix weird gcc4.5 problem w NefPoly 2014-03-24 01:33:52 +01:00
don bright 3d35e5ec74 make glib2 work on debian 6 (build libffi, build pkg-config) 2014-03-24 01:17:43 +01:00
don bright 237dee86fb fix build by requiring newer cmake for string(FIND function) in tests/ build 2014-03-24 00:27:09 +01:00
Don Bright 3bdd28ec2b fix broken mxe dependency build 2014-03-23 13:13:40 -05:00
Torsten Paul fcf7b27257 Merge pull request #712 from openscad/number-fix
Catch exceptions caused by parsing invalid double values (fixes #706).
2014-03-23 00:00:50 +01:00
Torsten Paul 7922c3dbc9 Catch exceptions caused by parsing invalid double values (fixes #706). 2014-03-22 23:46:34 +01:00
Don Bright 6d7db87b8e checkout stable branch of MXE in mingw-x-build-deps (match builder.sh) 2014-03-22 01:39:23 -05:00
Don Bright 87d553d134 .static not in stable branch of mxe yet, revert prev. commit 2014-03-22 01:36:09 -05:00
Don Bright 6fdd4e2041 do not build glib2 or gettext by default, assume most systems will have 2014-03-21 23:46:30 -05:00
Don Bright 6cb5f11f2e fix glib2 build for mingw. update mxe target to '.static' 2014-03-21 23:45:29 -05:00
Don Bright e32a3ff053 remove pythong paramiko from deps list 2014-03-21 22:56:18 -05:00
Don Bright d9220a25b3 dont always build glib2 in uni-build-deps, fix mingw issues + build on systems
that already have glib2
2014-03-19 20:49:15 -05:00
Don Bright 0d8c9359b5 fix build errors 2014-03-18 18:59:47 -05:00
Don Bright 3022a83148 disable ctrl-mouse-wheel zoom on Mac by default. add preference to toggle 2014-03-18 18:52:15 -05:00
Don Bright 33c81d96c9 fix issue #705 by using MXE's mingw-*-pkgconfig instead of system 2014-03-18 00:47:54 -05:00
Marius Kintel d2eecc4e06 access method for parent context 2014-03-16 00:10:45 -03:00
Don Bright 0dd7daf68d do not suggest the 'time saver' of only opencsg or cgal build, too confusing 2014-03-14 23:54:27 +02:00
Don Bright 8955a66153 do not build gettext or glib2 by default. fix glib2.pri to find system version.
fix spaces.
2014-03-14 22:19:45 +02:00
Marius Kintel 19de4c9d15 Merge branch 'master' into unstable 2014-03-10 10:42:53 -04:00
Torsten Paul b8dd47eae4 Merge pull request #698 from hroncok/patch-1
Make the desktop file valid
2014-03-10 09:47:07 +01:00
Miro Hrončok 3ac2b95c0a Make the desktop file valid 2014-03-10 09:45:05 +01:00
Marius Kintel 21c8d2fc98 typo 2014-03-09 15:04:07 -04:00
Marius Kintel 3e880cfb10 Merge branch 'master' of github.com:openscad/openscad 2014-03-09 13:17:58 -04:00
Marius Kintel 8d77775387 Don't delete MainWindows on close. See #694 2014-03-09 13:17:20 -04:00