3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 12:11:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
3064 commits 10 branches 72 tags 1.6 GiB
Commit graph

40 commits

Author SHA1 Message Date
SoftFever
40a17695c5 fix vs2022 deps 2023-07-16 10:58:18 +08:00
SoftFever
b76be35d5a fix OCCT patch failure 2023-07-15 00:10:03 +08:00
SoftFever
f6c5369e76 fix OCCT build on Mac when build_release_macos.sh 2023-06-30 14:00:53 +08:00
Maciej Lisiewski
e065809e3a
Fix building with GCC13 (required to build on Arch and Fedora) (#1220) 
* Backport TBB fix to allow building on GCC13

* Fix OpenEXR build with GCC13

* Fix Clipper2 build with GCC13

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
 2023-06-11 11:36:33 +08:00
Scott Mudge
a4b4ce0ff7
Dependency Update: add support for Visual Studio 2022, update Boost to 1.78, improve wxWidgets patch (#911) 
* Changed wxWidgets to use forked version with patch applied to 3.1.5, rather than patching at build. Updated boost to 1.78 for VS2022 support, and fixed boost compat issue.

* Boost update to 1.78 only for Windows, fixed wxWidgets re-patching issue for Windows, corrected wxWidgets webview nuget hash.

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
 2023-05-05 23:01:10 +08:00
SoftFever
b8c79d029a fix patch 2023-04-10 23:54:22 +08:00
SoftFever
07d048ef36 USE_PRIVATE_FONTS 2023-04-10 20:44:20 +08:00
SoftFever
2f994207b1 fix linux build 2023-03-15 00:00:13 +08:00
SoftFever
5b0ba1207e Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
c5abc98f11 minor changes 2023-03-10 18:35:57 +08:00
SoftFever
5ef51f6c8a Merge branch 'master-remote' into feature/1.5 
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/it/BambuStudio_it.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	deps/Boost/Boost.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/tips_arrow.svg
#	resources/profiles/Anycubic.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PC.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
#	resources/profiles/Anycubic/filament/fdm_filament_common.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
#	resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
#	resources/profiles/Anycubic/process/fdm_process_common.json
#	resources/profiles/BBL.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
#	resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
#	resources/profiles/Voron.json
#	resources/web/data/text.js
#	resources/web/image/printer/Anycubic 4Max Pro_cover.png
#	src/BambuStudio.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCodeWriter.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.hpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/AmsMappingPopup.hpp
#	src/slic3r/GUI/Auxiliary.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/DeviceManager.hpp
#	src/slic3r/GUI/ExtrusionCalibration.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/IMSlider.cpp
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/Jobs/PrintJob.hpp
#	src/slic3r/GUI/Jobs/SendJob.cpp
#	src/slic3r/GUI/Jobs/SendJob.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/MediaPlayCtrl.cpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/Printer/BambuTunnel.h
#	src/slic3r/GUI/Printer/PrinterFileSystem.cpp
#	src/slic3r/GUI/Printer/gstbambusrc.c
#	src/slic3r/GUI/Printer/gstbambusrc.h
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/ReleaseNote.hpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/GUI/SetBedTypeDialog.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/StatusPanel.hpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/Widgets/AMSControl.hpp
#	src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
#	src/slic3r/GUI/Widgets/Label.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/Process.cpp
#	src/slic3r/Utils/bambu_networking.hpp
#	version.inc
 2023-03-08 00:08:26 +08:00
lane.wei
a2f88ac9d5 ENH: deps: add a flag to select jpeg lib's version under linux 
by default use libjpeg.so.8

Change-Id: I2602820e7ef901badc7e27b6108b02eaf3597ffe
 2023-02-24 17:44:15 +08:00
gswatkins
9a117afbe3
Cleanup DOWNLOAD_EXTRACT_TIMESTAMP warning for CMake 3.24 (#327) 
CMake 3.24 introduces a new policy for managing timestamps on extracted contents
of downloaded archives. This change specifies the new behavior should be used
for dependencies to eliminate the warning printed when the policy is not set.
 2023-02-22 22:39:20 +08:00
Heiko Liebscher
2cdece2b14
fix_mac build (#228) 2023-01-26 00:37:17 +08:00
SoftFever
1bde73b6b1 fix linux build 
Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-01-22 11:44:33 +08:00
SoftFever
2492e5d39c merge upstream changes 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-21 00:37:10 +08:00
lane.wei
7e9ccefcaa FIX: boost: fix the patch failed issue of boost 
Change-Id: I6f689cd6dc08964cb759d09798b2bbe64c7aae85
 2023-01-17 19:37:56 +08:00
SoftFever
96c861f906
CICD (#167) 
CICD
 2023-01-12 22:55:50 +08:00
Joshua Wise
89d38fc6f6 deps/wxWidgets: avoid patching too many times 
Each time the dependency build was run, previously, the build system
attempted to patch wxWidgets after checking it out from Git.  The problem,
of course, is that if this happened once, it would not succeed a second
time, so the only workaround was to blow away the wxWidgets source tree.

The real solution to this is to create a BBL fork of wxWidgets (or to
upstream the changes...).  But for now, we add a file to determine whether
the patch has taken place already, and if it's there, we don't apply the
patch again.  This will mean that all kinds of exciting things happen if you
change Git revisions of wxWidgets or the patch changes (in those cases,
you'll have to blow away the build), but at least this makes it possible to
build twice in the same repository in the best case.

To update an existing checkout, run:

  $ touch deps/build/dep_wxWidgets-prefix/src/dep_wxWidgets/WXWIDGETS_PATCHED
 2023-01-12 14:23:37 +08:00
Joshua Wise
fe13ca0b52 Linux: update GLEW to 2.2.0, and enable EGL support in GLEW to match wxWidgets 
On Linux, wxGTK by default attempts to use EGL if it is available on the
system, rather than GLX.  Unfortunately, the ancient version of GLEW that we
packaged in did not support EGL, and even if it did, the configuration was
not set up to enable EGL.  To solve this, we:

  * upgrade GLEW to version 2.2.0, from upstream GitHub

  * modify the Bambu build process to enforce that we use GLEW from the
    built dependency

  * remove the "extra" even older GLEW that was packaged

  * modify GLEW's CMake configuration to enable EGL support when it is
    available on the system (using the same test as wxWidgets uses to decide
    whether to enable EGL support); if EGL isn't available at compile time,
    both GLEW and wxWidgets will fall back on GLX

Note that you probably will have to blow away your CMakeCache for this to
work correctly -- otherwise, you may end up with the system GLEW, if you
have one installed (which is probably not what you want -- on Ubuntu, the
system GLEW is GLX, not EGL).
 2023-01-12 12:29:59 +08:00
chunmao.guo
dfc1eec49b FIX: patch boost limit_handles 
Change-Id: Id155b1c23e19b4cbf7c4bea18ce138511d5f2b8f
 2023-01-10 19:08:26 +08:00
chunmao.guo
a953442c9e ENH: update WebView2 to 1.0.1418.22 
Change-Id: I76d4747f8e135368e9dae6ee9f3e980bf4ec6f81
 2023-01-10 19:08:26 +08:00
fang64
af44269767
app image builder feature (#86) 
* deps/wxWidgets: Disable EGL for wxGLCanvas

To work around <https://github.com/supermerill/SuperSlicer/issues/1093>.

* Fix USE_GLCANVAS_EGL=OFF for only Linux Builds

* Add -r flag to BuildLinux.sh to skip ram check

* Add support for AppImage build in containers.

* Add GitHub Action Workflow to Build AppImage

* Update AppImage-Builder to use upload-artifact v3

Co-authored-by: Zhaofeng Li <hello@zhaofeng.li>
 2023-01-02 14:48:20 +08:00
SoftFever
4803c35b76 streamline mac build script 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-01 12:27:48 +08:00
enricoturri1966
ef942d9d06 Updated deps-windows.cmake and Boost.cmake to be able to build dependencies using Visual Studio 2022 
(cherry picked from commit 1376c9cffdb23351d35270ef5673ea98789dcaaf)
 2022-12-25 14:30:56 +08:00
SoftFever
a688719e72 Revert "Merge branch 'SoftFever' into feature/calib" 
This reverts commit f5b28201fe, reversing
changes made to d9e9fb2206.

# Conflicts:
#	version.inc
 2022-12-25 12:39:45 +08:00
lane.wei
e03ac4957b ENH: curl: set backend to openssl for windows 
Change-Id: I64c3b9f29ec7e986585e7e8361931599d5398125
 2022-12-19 06:13:10 -05:00
tamasmeszaros
c87fda7f7a Fix Boost build not forwarding osx sdk flags to the compiler 
(cherry picked from commit 8c6f67a1645c596189d6601c5ed758e70adfd172)
 2022-12-16 22:51:07 -05:00
tamasmeszaros
d5a8db72ff Really fix boost build 
(cherry picked from commit 8d25bf680165f5db0cfd398525199fad64e7642e)
 2022-12-16 22:51:07 -05:00
tamasmeszaros
2f39bb0c2b Fix boost build 
(cherry picked from commit d3cf765a24cf54d0e2bae790cefb8d77444998f4)
 2022-12-16 22:51:07 -05:00
tamasmeszaros
6be5c9b3f8 Fix boost with clang on Linux and fix exclude rules for bad tests 
(cherry picked from commit 62fb70d1cb9513f4e54481fac31a1c0771d2a30a)
 2022-12-16 22:51:07 -05:00
tamasmeszaros
a5f9ab614a Update Boost to v1.78 
(cherry picked from commit 776a125b9b5fb4af1d9c57b78063012ad6421f4b)
 2022-12-16 22:51:07 -05:00
enricoturri1966
a89d896679 Updated deps-windows.cmake and Boost.cmake to be able to build dependencies using Visual Studio 2022 
(cherry picked from commit 1376c9cffdb23351d35270ef5673ea98789dcaaf)
 2022-12-16 22:51:07 -05:00
lane.wei
5d013a40a4 ENH: use openssl in mac 
Change-Id: Idbd5fe9232d6acc1aaa7ddeb1e6f312c1a6fcb44
 2022-12-15 04:38:15 -05:00
lane.wei
27d2008037 ENH: use wxFont::AddPrivateFont to load fonts for linux 
Change-Id: Iefe1753a08fd188a274b4d555c5fcda8fca6d719
 2022-12-15 04:38:15 -05:00
lane.wei
1c1e5f8ef8 Set the deploy target version to 10.15 of deps 
Change-Id: I50c0ff6f306aaa039fa76ae601331fedb541b13a
 2022-09-13 19:42:32 +08:00
lane.wei
5b7cf54cf5 fix some building issues under linux 
Change-Id: I787024a74e15ef3904dcffe233e4387bdfc139b3
 2022-09-08 21:49:36 +08:00
yifan.wu
13b711602c ENH: add freetype for occt 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I3adcf4b27deb0953e059c3e7fa9b9d49e447c57b
(cherry picked from commit 400cff06210c62e4019ff6f7174216d2faeaa8e2)
 2022-08-26 09:25:59 +08:00
gerrit
cc1a6ee635 support linux build for wxWidgets 
Change-Id: I7d4e84c4e82371c6e688b607ac0658c6319d1216
(cherry picked from commit 6ff1613c3997628ea932d4956f874c2356da0056)
 2022-08-26 09:25:59 +08:00
lane.wei
1555904bef Add the full source of BambuStudio 
using version 1.0.10
 2022-07-15 23:42:08 +08:00