Commit Graph

224 Commits

Author SHA1 Message Date
tamasmeszaros
158413f4c4 Disable wxMediaCtrl in wxWidgets build
We don't need it. Building on Linux causes problems with gstreamer.
fixes #5815, #6160
2021-03-09 12:37:17 +01:00
Vojtech Bubnik
d7a786e8c8 Bumping up wxWidgets to 3.1.4-patched on all platforms. 2021-03-01 11:36:11 +01:00
tamasmeszaros
6f89da1f39 Disable libicu for boost-regex
Should have been disabled from the beginning
2021-02-04 20:31:50 +01:00
Vojtech Bubnik
264ce71e94 Bumped up wxWidgets version on OSX for X86. 2021-01-19 14:26:37 +01:00
Vojtech Bubnik
d28d8dda75 Updated boost requies date_time library to be compiled. 2021-01-15 18:07:14 +01:00
Vojtech Bubnik
dd9269a9d1 Bumped up boost version from 1.70.0 to 1.75.0 mainly due to an issue
with an updated Xcode / clang incorrectly reporting that it supports
__cpp_lib_uncaught_exceptions while it does not if targeting older
platforms. This issue has been fixed in boost 1.74.0 and 1.75.0
2021-01-15 13:46:33 +01:00
tamasmeszaros
f94498eac3 Fix for not finding CGAL in 32 bit MSVC 2020-12-03 14:07:15 +01:00
Vojtech Bubnik
fa24d598a7 The new OSX 11 (Big Sur) is not compatible with wxWidgets 3.1.3.
Let's use patched wxWidgets 3.1.4, even though it is not quite tested.
Use the tested patched wxWidgets 3.1.3 everywhere else.
2020-12-01 16:54:20 +01:00
Vojtech Bubnik
cef9985b93 Follow-up to 1719a9b3d1:
Only disable NEON extension for Apple ARM builds, leave it enabled for Raspberry PI.
2020-12-01 16:49:47 +01:00
Jason Scurtu
d5a6602f1c bump gmp version 2020-11-28 19:55:09 +01:00
Jason Scurtu
1719a9b3d1 fix typo and disable ARM_NEON check 2020-11-28 19:48:09 +01:00
Jason Scurtu
d780b33a16 apple silicon target
- move rpi4 detection to Linux
- set(_gmp_build_tgt aarch64) for Apple Silicon
2020-11-28 19:47:46 +01:00
Jason Scurtu
d01f6b8d45 add -DDISABLE_DEPENDENCY_TRACKING to libpng.
- fixes "PNG_ARM_NEON_FILE undefined" error
2020-11-28 15:23:38 +01:00
tamasmeszaros
0a932ebfe3 Enable http digest authentication for CURL 2020-11-25 13:58:03 +01:00
tamasmeszaros
5fb0858677 Fix CGAL unknown version issue
CGAL is not advertising its version if configured as a header only library.
2020-10-26 15:39:40 +01:00
tamasmeszaros
5ef309205d Do the png fix for all platforms 2020-10-26 10:10:09 +01:00
tamasmeszaros
335f04ddf0 Limit the png fix for Linux
temporarily...
2020-10-23 11:10:00 +02:00
tamasmeszaros
9782a584f0 Fix issues with libpng for good
Add "prusaslicer_" prefix to static libpng in deps
2020-10-23 11:04:36 +02:00
tamasmeszaros
d904862bc7 Build libpng as part of deps on Linux
- We've found counter case where the system provided one is missing or is too old.
2020-09-01 19:04:22 +02:00
tamasmeszaros
ec687465fd
Merge pull request #4424 from bgiot/fix_macos_png_issue
Fix macos build: Use the correct LIBPNG
2020-07-13 10:44:05 +02:00
bgiot
21648c6356 Fix macos deps 2020-07-06 12:45:06 +02:00
bubnikv
c10f6a622d Fixed unit tests on Windows after introduction of GMP to
boost::polygon Voronoi diagram generator by Vojtech.

Fixed Perl bindings on Windows after some "improvement" of the Windows 10
SDK headers, which fail if included from a C++ code using the
extern "C"
clause. Namely, the Windows 10 SDK include for sockets introduces C++ macros
if a "compiled with C++" symbol is provided even if included through
exetrn "C".
2020-06-27 08:44:13 +02:00
bgiot
92f0c01ee3 Use the correct LIBPNG 2020-06-22 16:47:57 +02:00
Vojtech Bubnik
180742ccaa Pulling patched boost::polygon from github prusa3d/polygon. 2020-05-22 15:33:11 +02:00
tamasmeszaros
8969613a5a Fix cmake error on unixes 2020-05-07 12:46:37 +02:00
tamasmeszaros
55e4b48642 deps: fix ZLIB being built after its needed 2020-05-07 09:42:11 +02:00
tamasmeszaros
e5c5ee6636 deps: disable wxWidgets library internal asserts 2020-04-30 14:33:23 +02:00
tamasmeszaros
9cb5975956 bring back required switch for opengl with dep_GLEW 2020-04-29 09:44:46 +02:00
tamasmeszaros
572b5ba8bb Add PNG and wxWidgets 3.1.3 uniformly to all platforms with cmake build.
wx is built with png as a dependency, wxpng is disabled.
2020-04-28 15:01:56 +02:00
Vojtech Bubnik
b578b7ec87 New parameter DEP_WX_GTK3=on/off to build wxWidgets against GTK3. 2020-04-02 11:42:45 +02:00
tamasmeszaros
1123689a22 Search for openssl cert store on app init, if the store is not present.
fixes  #3851
2020-03-25 09:41:29 +01:00
bubnikv
d5bcddeed3 Revert "Deps libdir for libcurl on linux to land to the same directory"
This reverts commit 38d06d57a0.
2020-03-21 11:55:51 +01:00
bubnikv
38d06d57a0 Deps libdir for libcurl on linux to land to the same directory
as openssl libraries.
Follow-up to 170650169c
2020-03-20 08:55:11 +01:00
bubnikv
170650169c Deps libdir for openssl on linux 2020-03-19 21:33:03 +01:00
bubnikv
d5149275b0 Hopefully fixing missing OpenSSL dependency of libcurl on Linux 64bit. 2020-03-19 20:48:53 +01:00
tamasmeszaros
abdcc88e9a Add explicit flags for GMP and MPFR
Bump up arm version to 7

armv7-a has to be added as march, rpi4 fails to build with plain armv7
fixes #3847
2020-03-18 12:18:07 +01:00
tamasmeszaros
e1ecf03e0c Revert "Fix minimum osx version not being specified for GMP and MPFR"
CXXFLAGS overrides default flags for gmp and mpfr
2020-03-17 08:55:51 +01:00
tamasmeszaros
7118d77bea Fix minimum osx version not being specified for GMP and MPFR
put `env` before configure and the variables
addresses issue #3847
2020-03-16 15:15:46 +01:00
tamasmeszaros
cb39f6b212 Use CheckAtomic differently 2020-01-23 17:20:02 +01:00
tamasmeszaros
81b7f437da update openvdb build patch to solve latomic 2020-01-23 16:29:08 +01:00
tamasmeszaros
fde0803a89 Upgrade GMP version (link errors similar to RPI) 2020-01-23 13:45:20 +01:00
Lukas Matena
63b0eec5a9 Merge branch 'master' into lm_tm_hollowing 2020-01-21 13:00:07 +01:00
tamasmeszaros
053818d028 Fix MPFR being built as shared library 2020-01-21 10:12:45 +01:00
Lukas Matena
b3f15b1c98 Merge branch 'master' into lm_tm_hollowing 2019-12-20 10:33:53 +01:00
tamasmeszaros
8f655242eb Fix for CGAL relocation fix. Wrong libdir was used. 2019-12-18 15:42:53 +01:00
tamasmeszaros
4220124658 Add mpfr download mirror 2019-12-18 11:58:39 +01:00
tamasmeszaros
9bf09e2874 Fix linking of OpenVDB in debug mode on multi conf generators. 2019-12-17 16:50:00 +01:00
tamasmeszaros
17de6ff51a Fix linking of OpenVDB in debug mode on multi conf generators. 2019-12-17 16:26:06 +01:00
tamasmeszaros
d349f24021 Fix CGAL config script being non-relocatable 2019-12-17 13:06:49 +01:00
tamasmeszaros
c3214e9f86 Fix CGAL config script being non-relocatable 2019-12-17 13:05:18 +01:00
tamasmeszaros
20e59cb0c7 Fix missing gmpxx from dep_GMP 2019-12-17 10:54:54 +01:00
tamasmeszaros
c81b1fbbbd Fix missing gmpxx from dep_GMP 2019-12-17 10:51:31 +01:00
tamasmeszaros
c26705ddad Try to fix deps build on win32 with forwarding CMAKE_GENERATOR_PLATFORM 2019-12-12 13:09:57 +01:00
tamasmeszaros
4a931c037a Fix CGAL target name 2019-12-11 14:23:12 +01:00
tamasmeszaros
e2bea1ed17 Merge branch 'tm_opencsg' 2019-12-11 14:04:04 +01:00
tamasmeszaros
4282c57069 Fix zlib on msvc 2019-12-11 14:01:14 +01:00
tamasmeszaros
4a4d8b4e26 Fix zlib dependencies and CMAKE_MODULE_PATH forwarding 2019-12-11 14:01:07 +01:00
tamasmeszaros
5b67ce5105 Merge branch 'tm_opencsg' 2019-12-11 12:52:03 +01:00
tamasmeszaros
38aa5cb437 Finding GLEW work in release and debug.
Make building in release and debug in one cmake run on msvc with the prusaslicer_add_cmake_project function.
2019-12-11 12:32:29 +01:00
YuSanka
bced486db3 GIT_TAG for deps-macos.cmake is changed to "v3.1.3-patched" 2019-12-11 10:32:50 +01:00
tamasmeszaros
1cf057abbc Add dlls into bin rather than lib 2019-12-10 15:49:52 +01:00
tamasmeszaros
784728bff8 Fix missing GLEW link to OpenCSG 2019-12-10 13:57:57 +01:00
tamasmeszaros
b47869c4ac Register OpenCSG in deps 2019-12-10 13:51:53 +01:00
tamasmeszaros
7ef4183d0f Fixes on the prusaslicer_add_cmake_project function 2019-12-10 13:46:04 +01:00
tamasmeszaros
c6223e5d7c Add CGAL to ALL build 2019-12-10 12:52:28 +01:00
tamasmeszaros
f94321e117 Add Unix builds for gmp and mpfr, downloading and configure for cgal 2019-12-10 12:50:52 +01:00
tamasmeszaros
2cc45dbf21 Add cgal mpfr and gmp for msvc with prebuilt binaries. 2019-12-10 11:22:45 +01:00
tamasmeszaros
1355efbb67 Add OpenCSG to deps (except for instant debug build with msvc) 2019-12-10 11:22:19 +01:00
Vojtech Kral
e7838abddc WIP: Build on CentOS 6 2019-11-29 13:10:30 +01:00
David Kocik
77d6c97feb deps-linux newer openSSL 2019-11-26 12:30:43 +01:00
tamasmeszaros
54357f846f Change blosc patching "checkout -f" to "reset --hard" 2019-11-18 12:09:46 +01:00
tamasmeszaros
3b8ee78400 Use the upstream qhull with the macos patch instead of patching manually 2019-11-18 11:05:25 +01:00
tamasmeszaros
cfc927b371 Fix qhull download 2019-11-18 10:59:58 +01:00
tamasmeszaros
ab735bdc54 Follow up: fixing patches on windows 2019-11-18 09:35:26 +01:00
tamasmeszaros
7baefdf79d Fix for deps patching 2019-11-18 10:04:32 +01:00
Vojtech Kral
7a24f87c7f Fix deps build on Mac
Fix #2264
2019-11-11 15:44:12 +01:00
tamasmeszaros
91829f9a35 Remove git update step from deps where patch is applied. 2019-11-01 15:33:36 +01:00
Vojtech Kral
581bbc85d6 deps: Fix boost build on MacOS 2019-11-01 10:11:46 +01:00
tamasmeszaros
89801f00c5 Add explicit ZLIB system package requirement on Unix systems.
We already depended on that but is wasn't stated in the deps script.
2019-10-30 18:08:16 +01:00
tamasmeszaros
2e7ac3bfa6 fix openvdb dependency build bugs
Fixes for release only build of dependencies on windows


Omit blosc packing in deps build


Try to fix patching by reverting to git repos in download steps

Patching does not remove or rename files.
2019-10-30 17:22:10 +01:00
tamasmeszaros
4554da29ab Add OpenVDB to dependencies
* Add Linux openvdb integration
* Add Mac openvdb integration and enable in ALL
* Create openvdb sandbox to test integration.
* Additional fixes in the patches
* Remove slabasebed sandbox as it has no relevance now
* Provide FindOpenVDB module and fix build issues
2019-10-25 13:15:21 +02:00
tamasmeszaros
7e0199746e more clang warnings enabled, performance measuring
Succesfull build on mingw-w64


fix sandboxes


Mingw fixes and full parallel support tree gen.
2019-08-16 16:17:37 +02:00
tamasmeszaros
7d25d8c677 Can build with (original llvm) clang-cl on windows 2019-08-01 16:03:52 +02:00
Vojtech Kral
ab677bad41 Mac OS: Fix gettext lookup in deps build 2019-07-22 16:00:52 +02:00
bubnikv
ab7ecc1819 Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
tamasmeszaros
386a42b4c5 Disable dep_libigl in deps. Include dir collisions... 2019-07-09 10:15:40 +02:00
bubnikv
c7cc760067 Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00
tamasmeszaros
74b420d608 Remove option for igl static build due to Eigen version mismatch . 2019-06-26 17:06:41 +02:00
bubnikv
a710e7e7e4 WIP: Undo / Redo stack.
Integration of the "cereal" serialization library.
Serialization / deserialization of the DynamicConfig / DynamicPrintConfig.
DynamicPrintConfig serializes ordinal identifiers instead
of the option key strings to conserve space.
2019-06-26 13:26:49 +02:00
tamasmeszaros
b8f9d2e2d8 Update default igl dependency to header-only. 2019-06-20 12:54:43 +02:00
tamasmeszaros
bb58d0fb69 Add some missing methods into the igl patch.
Also, make the static igl dep build the default.
2019-06-20 14:15:36 +02:00
tamasmeszaros
2ae2672ee9 Building igl statically and moving to the dep scripts
Fixing dep build script on Windows and removing some warnings.

Use bundled igl by default.

Not building with the dependency scripts if not explicitly stated. This way, it will stay in
Fix the libigl patch to include C source files in header only mode.
2019-06-19 14:52:55 +02:00
tamasmeszaros
ee2b6abd61 Exclude qhull from default dependency targets, make it optional. 2019-06-06 16:50:51 +02:00
tamasmeszaros
5d054d90ed Update patch for qhull to compile on Windows. 2019-06-06 16:11:52 +02:00
bubnikv
0fbebe85da Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-06 11:40:52 +02:00
bubnikv
c9a847a6a6 Support for Visual Studio 2019 Community 2019-06-06 11:40:35 +02:00
tamasmeszaros
6136fe7d92 Future-proof qhull dependency handling 2019-06-05 19:19:49 +02:00
bubnikv
a3c1ef509c Further renaming to PrusaSlicer 2019-05-13 15:14:33 +02:00
bubnikv
52c28578d6 Fixed compilation of dependencies on OSX 2019-04-30 12:19:29 +02:00
bubnikv
0a1c092d75 Use Prusa3D patched wxWidgets 3.1.1 2019-04-30 12:00:23 +02:00
Vojtech Bubnik
31d377d09f Some refactoring and documentation, modified Windows dependencies to compile against patched wxWidgets 2019-04-23 12:35:26 +02:00
Vojtech Kral
a8a2125069 Windows deps & build doc: Fix msbuild parallelism, cf. #2078 2019-04-08 10:04:40 +02:00
Vojtech Kral
ccafc43874 deps: Link wxWidgets against system zlib on Unix 2019-03-25 15:39:12 +01:00
tamasmeszaros
c1186340d2 Fix for missing dep_zlib on in deps scripts 2019-03-25 14:06:28 +01:00
Vojtech Kral
ea6e6023f9 deps: Fix: remove dep_libpng 2019-03-25 12:31:14 +01:00
Vojtech Kral
8e2ec38670 deps: Remove libpng 2019-03-25 11:44:07 +01:00
tamasmeszaros
e927c65c0a Some fixes for dependency targets on Linux 2019-03-25 11:41:16 +01:00
Vojtech Kral
a99c823401 Build: MSVC 2017 compat (w/o xs code - Perl unit tests) 2019-01-29 17:11:07 +01:00
Vojtech Kral
e8d63f3eb1 Upgrade Boost to 1.66 on Windows 2019-01-16 15:14:18 +01:00
Vojtech Kral
e5062e8662 deps: Use wxWidgets 3.1.2 on Mac, use system SDK by default, various bugfixes 2019-01-10 14:02:13 +01:00
Vojtech Kral
cde0aa4443 Fix: wxWidgets 3.0 back-compat
Fix #1599
2019-01-09 18:43:29 +01:00
Vojtech Kral
f013972d8b doc: Add build tutorial for Unix/Linux 2019-01-07 17:25:12 +01:00
Vojtech Kral
39c0e80ce8 deps: Fix libpng and zlib on Windows 2019-01-07 17:25:12 +01:00
Vojtech Kral
f3e238073b Mac OS build: Set a default SDK target, fix c/cxx flags in deps/boost 2018-12-13 18:52:03 +01:00
Vojtech Kral
930f8c13c1 deps: unix: Remove zlib, disable nlopt shared build 2018-12-03 17:33:56 +01:00
Vojtech Kral
2bdb86c7ed deps: warn that wx-config can't be moved into another location 2018-12-03 10:48:59 +01:00
Vojtech Kral
6693b2102d deps script for Mac OS, XCode support fix 2018-12-03 10:21:06 +01:00
Vojtech Kral
138c98b5ec Deps: Windows: Fix a couple of configurations 2018-11-30 18:01:23 +01:00
Vojtech Kral
0984c9a111 deps: Fix dependency list 2018-10-31 17:29:21 +01:00
Vojtech Kral
ce7d196b43 deps: Add gtest, nlopt, zlib, and libpng, add debug configurations on Windows 2018-10-23 19:11:08 +02:00
Vojtech Kral
97e7b6f18b deps: Fix arch resolution on Windows 2018-10-16 11:56:22 +02:00
Vojtech Kral
0263769d8f deps: Back to Boost 1.63 on Windows as newer ones require newer CMake
32bit deps fix
2018-10-16 11:55:46 +02:00
Vojtech Kral
fb6c1a885c Build: Fix deps-unix-static.cmake 2018-10-15 17:28:56 +02:00
Vojtech Kral
0b0e65636f Build improvements: symlink resources properly with Visual Studio
Convert dependencies into a CMake build script in the `deps` dir
2018-10-15 16:47:15 +02:00