Commit Graph

175 Commits

Author SHA1 Message Date
tamasmeszaros
98f0cc0dec Follow up, make png non required for now 2020-04-28 20:43: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
bubnikv
fcb04039e8 New shorcut _L() for _(L())
New shorcut _u8L() for _utf8(L())
2020-03-14 17:51:56 +01:00
tamasmeszaros
b6aeffb618 Link libcurl and wxWidgets to libslic3r_gui
Also enhance and remove duplicate CURL search in cmake
2020-03-06 15:16:46 +01:00
bubnikv
7c55674220 Disabled implicit conversion of wxString to std::string or const char*
and vice versa. Fixed one last implicit wxString conversion.
2020-02-27 17:02:08 +01:00
tamasmeszaros
2fb1acd74b Add check for cereal library in CMake
Fixes #3547, replaces #3613
2020-02-07 11:07:22 +01:00
tamasmeszaros
2e039d3955 Fix dll copying 2020-02-06 11:59:02 +01:00
Lukas Matena
63b0eec5a9 Merge branch 'master' into lm_tm_hollowing 2020-01-21 13:00:07 +01:00
tamasmeszaros
a1dc7a5c41 Fix build issues on Windows 2020-01-16 14:25:01 +01:00
bubnikv
19f0f50e98 MSVC specific: Disable STL4007: Many result_type typedefs and
all argument_type, first_argument_type, and second_argument_type
typedefs are deprecated in C++17.

Remove this warning disable after eigen library adapts to the new C++17 adaptor rules.
2020-01-13 16:01:20 +01:00
Lukas Matena
0551411c48 Merge branch 'master' into lm_tm_hollowing 2020-01-06 12:41:29 +01:00
bubnikv
692ed26091 Fix of #3366
Fixed crash due to incorrect localization of the percent sign in
"The %1% infill pattern is not supposed to work at 100%% density."
This happens for ES, FR, IT, UK and ZH_TW localizations.

Also added a new CMake target "gettext_po_to_mo" to convert
all po files to mo files,
and renamed the "pot" target to "gettext_make_pot".
2019-12-22 11:54:23 +01:00
Lukas Matena
b3f15b1c98 Merge branch 'master' into lm_tm_hollowing 2019-12-20 10:33:53 +01:00
tamasmeszaros
c97aacd2d8 Officially move to C++17 for the whole PrusaSlicer source tree; 2019-12-18 11:53:28 +01:00
tamasmeszaros
4e27faa236 Only consider openvdb debug if necessary. Add REQUIRED to openvdb 2019-12-17 16:53:45 +01:00
Lukas Matena
537260494d Merge branch 'master' into lm_tm_hollowing 2019-12-12 11:37:33 +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
tamasmeszaros
fc19666fa2 Add dll copy after targets for gmp and mpfr 2019-12-10 17:42:25 +01:00
tamasmeszaros
5e4c4a689c According to cmake, minimum required call shall go before project().
BTW This will make boost config detect the right toolset on every platform.
2019-11-25 10:56:50 +01:00
tamasmeszaros
7011c58faa Merge branch 'master' into lm_tm_hollowing 2019-11-18 17:50:56 +01:00
Enrico Turri
46601f7e1e Added missing boost libraries into CMakeLists.txt 2019-11-12 12:05:13 +01:00
tamasmeszaros
dfa4a58dc6 Bump up C++ to 14 2019-11-12 10:28:00 +01:00
Lukas Matena
7542580ac1 Merge branch 'tm_openvdb_integration' into lm_hollow_gizmo 2019-11-05 11:16:51 +01:00
Vojtech Kral
add2b34d06 build: Fix linking on Mac OS with ASAN on 2019-11-01 10:11:50 +01:00
tamasmeszaros
d63ae1c608 Simple openvdb conversion test. 2019-10-29 16:27:53 +01:00
tamasmeszaros
1cc7bd9976 Fix openvdb dependency in libslic3r 2019-10-25 15:48:01 +02:00
tamasmeszaros
5c0cd06f2f Completely disable openvdb for now 2019-10-25 13:38:18 +02:00
tamasmeszaros
bcc2c21d5f Disable OpenVDB until deps get updated 2019-10-25 13:23:05 +02:00
tamasmeszaros
deda712e20 Merge branch 'tm_openvdb_integration' 2019-10-25 13:16:26 +02: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
eee20e23e1 Fix RelWithDebInfo build on Linux 2019-10-24 17:32:58 +02:00
tamasmeszaros
d481feda13 Fix for unsupported cmake feature 2019-10-23 16:26:28 +02:00
tamasmeszaros
8961e68f5e another cleanup 2019-10-22 17:04:32 +02:00
tamasmeszaros
7f0c4fafe6 Remove cmake debug messages 2019-10-22 16:42:40 +02:00
tamasmeszaros
9f9a40100f Solve build fail in RelWithDebInfo config with several imported targets. 2019-10-22 16:32:57 +02:00
Lukas Matena
fb7bba2b5a CMakeLists.txt: turning off -W-ignored-attributes, there are loads of those with newer GCC, originating from Eigen (https://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221) 2019-10-17 09:56:38 +02:00
Lukas Matena
605f0ecd54 Revert "CMakeLists.txt: turning off Wno-ignored-attributes on GCC and Clang again"
That change breaks compilation on the old buildserver (gcc 5.4). We'll deal with the warning later somehow.

This reverts commit 50448bf4dd.
2019-10-16 12:53:25 +02:00
Lukas Matena
50448bf4dd CMakeLists.txt: turning off Wno-ignored-attributes on GCC and Clang again
Eigen still produces tons of those warnings on newer gcc
2019-10-15 15:10:52 +02:00
tamasmeszaros
fbc174ad06 Fix cmake with msvc generator.
* Remove unused libnest2d files. Make it use the global build script targets.
* Modify FindTBB to address multi-config builds and take care of __TBB_NO_IMPLICIT_LINKAGE
* Move FindNLopt to project common cmake module dir
* Rename libnest.hpp to nester.hpp and libnest.h to libnest.hpp 
* Clean up common test suite build scripts
2019-10-14 12:50:08 +02:00
tamasmeszaros
d5dcba00b1 Time conversion functions with tests.
Fixes issue with incorrect characters in time strings on UI.
Fix platform dependency


Fix return value with incorrect strings.


Just use strptime and strftime on all platforms.

Emulate strptime on msvc... because they don't have it and their get_time is buggy.
2019-10-02 14:44:11 +02:00
Vojtech Kral
bc6bb85d65
Merge pull request #2646 from labsin/no_FHS_build
Only set SLIC3R_FHS_RESOURCES when SLIC3R_FHS is set
2019-09-02 12:16:15 +02:00
bubnikv
8865c4b685 Plurals for number of Undo / Redo actions. 2019-08-28 16:19:46 +02:00
bubnikv
cd35fd9b34 Refreshed the dictionaries.
Introduced a new localization macro L_CONTEXT(string, context)
to define context dependent translations.

The only strings - "Top" and "Bottom" were already using context, but
until now the context had to be added to the PrusaSlicer.pot file
manually, while the context is being generated automatically now.
2019-08-27 17:14:03 +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
26c2b16f61 Build: Remove SLIC3R_SYNTAXONLY 2019-07-26 14:27:37 +02:00
Lukas Matena
0a5f8aa2e8 An attempt to silence the Wreorder warning on OSX build server
Clang apparently cares about order of command line arguments, so -Wall should come before -Wno-whatever
2019-07-23 15:13:47 +02:00
Lukas Matena
91a5d70a62 Fixed a few warnings in headers (meaning they were reported once for each include)
Fixed an identification of CXX compiler in cmake so that 'AppleClang' is recognized
2019-07-23 14:02:20 +02:00
Yuri D'Elia
77c3d2fbb3 Use system Eigen3 on linux when found 2019-07-22 14:53:51 +02:00
Sam Segers
b5ff4bbb52 Only set SLIC3R_FHS_RESOURCES when SLIC3R_FHS is set
This makes it possible to run slic3r in a temporary direction
with

  make DESTDIR="run" install
2019-07-16 23:12:07 +02:00
Lukas Matena
004e2719b1 Merge branch 'master' into lm_warnings 2019-07-15 13:26:55 +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
Lukas Matena
471331e8c1 CMake: -Wignored-attributes is not supported in GCC<6.1
-turned off -Wunknown-pragmas for GCC
2019-06-25 16:04:24 +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
bubnikv
c95a324c3f Merge branch 'vb_admesh_fix' 2019-06-18 08:54:50 +02:00
tamasmeszaros
821ca0e36a Build fix when boost is not in prefix/boost 2019-06-13 14:19:24 +02:00
bubnikv
7dd842b294 Merge remote-tracking branch 'remotes/origin/master' into vb_admesh_fix 2019-06-06 21:01:19 +02:00
bubnikv
c9a847a6a6 Support for Visual Studio 2019 Community 2019-06-06 11:40:35 +02:00
bubnikv
8da54139c4 WIP: Admesh - replacement of C memory allocation with std vectors 2019-06-04 22:06:42 +02:00
tamasmeszaros
96380180f4 Build system tweaks to get rid of cmake and boost warnings. 2019-05-30 17:48:32 +02:00
bubnikv
cebb814a56 Generate debug symbols for Windows builds even in Release mode. 2019-05-13 19:31:20 +02:00
bubnikv
a3c1ef509c Further renaming to PrusaSlicer 2019-05-13 15:14:33 +02:00
bubnikv
56256519cc WIP: Renaming to PrusaSlicer.
Removed the obsolte icons.
2019-05-13 12:13:28 +02:00
bubnikv
4fdcc99d35 Require Boost 1.64.0 and newer on Linux & OSX due to the Boost::process
library
2019-05-06 18:30:59 +02:00
Vojtech Bubnik
0923bcec34 Added explicit linkage of pthreads library (needed on raspberry PI) 2019-04-23 11:02:57 +02:00
bubnikv
63a0d1aeee Added comments to the gettext dictionaries generated by the xgettext tool.
The prefix to be searched for in the source code comments is TRN
2019-04-18 10:13:56 +02:00
bubnikv
349e30a39c WIP: Restoring of the command line only builds (no GUI support). 2019-04-12 12:16:44 +02:00
Vojtech Kral
ba66f34c45 Build: Add an option to choose GTK version on Linux, fix #1937 2019-03-25 15:50:57 +01:00
bubnikv
eec289961a Removed Microsoft specific _DEBUG flag from the Unix systems.
Made condional compilation of assert code based on #ifndef NDEBUG
instead of #ifdef _DEBUG to compile on Unix systems.
2019-01-30 15:27:11 +01:00
bubnikv
c4bc45cff4 Add DEBUG and _DEBUG symbols on OSX & Linux in a way the Visual Studio
does that.
2019-01-29 09:57:17 +01:00
Vojtech Kral
d1c569dd57 Mac: Implement Retina for the 3D scene, fix #97 2019-01-24 20:03:12 +01:00
Vojtech Kral
c63aff6dda Build: Fix deployment target on Mac #1421 2019-01-11 17:05:57 +01:00
Vojtech Kral
6db40feace Build: Add a flag to disable PCH 2019-01-11 12:49:24 +01:00
Vojtech Kral
cde0aa4443 Fix: wxWidgets 3.0 back-compat
Fix #1599
2019-01-09 18:43:29 +01:00
Vojtech Kral
5aec48418a
Merge pull request #1613 from hexane360/cmake-fixes
CMake pre-compiled header and warning fixes
2019-01-09 18:20:23 +01:00
hexane360
d681eef10e Added version check for Eigen (>=3.0) 2019-01-09 10:13:34 -07:00
hexane360
b406eeb240 Fixed several warnings on Linux
-isolated C++-only options on newer CMake
-Removed warning for ignored-attributes on Clang and GCC
2019-01-07 16:59:09 -07:00
Vojtech Kral
8bc8dfaba4 Build: Fix install targets, add SLIC3R_FHS, check resource dir on GUI_App init
Fix #1515
2019-01-07 17:25:12 +01:00
Vojtech Kral
f8b83d20d3 Build: Warn about non-existent CMAKE_PREFIX_PATH 2019-01-02 13:38:43 +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
138c98b5ec Deps: Windows: Fix a couple of configurations 2018-11-30 18:01:23 +01:00
Vojtech Kral
9a20578daf Build: Fix ASan on OS X 2018-11-26 19:02:30 +01:00
bubnikv
a378bb7bed Removed some obsolete Perl bindings.
Removed libslic3r from the default include paths for all modules but
libslic3r. Now headers from libslic3r need to be included with an
explicit path (libslic3r/libslic3r.h etc)
Split the localization macros into I18N.{cpp,h}
2018-11-26 14:41:58 +01:00
Vojtech Kral
4cb5c2a21b CMake: Add option for a syntax-only build 2018-11-20 23:05:47 +01:00
tamasmeszaros
87d49cf82f Adding object elevation param.
Quick attempt to build with MinGW 7.3. Successful compile, failed linking
2018-11-19 17:58:08 +01:00
tamasmeszaros
4662fd0e73 Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend 2018-11-08 16:19:22 +01:00
YuSanka
2c0b784a2d Added(ported) function fix_through_netfabb()
+ Fixed adding of the instances to the object list
2018-11-08 09:58:48 +01:00
Vojtech Kral
8c4fa9ba51 CMake: Add ASan option 2018-11-07 17:38:08 +01:00
tamasmeszaros
22c9c5ae95 Trying to engage support creation when the gizmo gets disabled. 2018-11-06 18:01:18 +01:00
tamasmeszaros
48bc166d6d Importing the SLA computing module into the native source tree. 2018-11-02 11:57:57 +01:00
bubnikv
75c097010d Finished (?) switching between the FDM / SLA profiles,
fixed an invalidation bug in Print::apply()
2018-10-31 18:05:25 +01:00
bubnikv
6539c54f23 Fixed precompiled headers compilation on GCC. 2018-10-29 17:04:27 +01:00
bubnikv
5377304b0c Precompiled headers on Visual Studio & GCC, with the highest hopes
that it will not break the build server.
2018-10-29 16:01:26 +01:00
bubnikv
de55a60bf5 Added /bigobj (Increase Number of Sections in .Obj file)
Fixed external declaration of slic3r_main()
2018-10-26 18:08:43 +02:00
bubnikv
0799ca2099 Fixes of the CMake build system to compile Release and Debug builds
on MS Windows.
2018-10-22 19:54:38 +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
Vojtech Kral
d843f1a76f Fix resources dir location, add wxWidgets to Windows deps build script 2018-10-12 11:37:05 +02:00