Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a line to build_bambu.yml to allow building for Windows and added build_win.yml to conserve build time #5074

Closed
wants to merge 91 commits into from

Conversation

tsmith35
Copy link

The single-line addition to build_bambu.yml allows Github to properly build for Windows. Added a separate build_win.yml to allow for building for Windows only, thereby conserving build time and Github resources.

Add PkgConfigLite to permit building for Windows
@tsmith35
Copy link
Author

This PR allows more people to easily collaborate on Bambu Studio development by making it easier for Windows users to build compatible checks

@tsmith35
Copy link
Author

I should mention that the build_bambu.yml change is necessary because the parameter "- name: Install nsis and pkgconfig" only installed nsis and did not install pkgconfig, so the build of "windows_latest" failed unless pkgconfig had previously been installed.

This is typically the case when trying to build Bambu Studio on a forked copy of the repo. The pkgconfig step was missing in the initial commit made by @MackBambu on 6/11/24. I'm guessing that it was inadvertently left off (copy/paste typo?) and was not noticed because the original repo already had pkgconfig installed.

@tsmith35
Copy link
Author

Thank you, @lanewei120

Copy link
Contributor

@MackBambu MackBambu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your pull request. Currently, we would prefer assistance with the macOS 14 build workflow.

.github/workflows/build_bambu.yml Show resolved Hide resolved
.github/workflows/build_win.yml Show resolved Hide resolved
fatih5228 and others added 23 commits October 30, 2024 01:49
Update Turkish language
src/libslic3r/Brim.cpp: In function ‘Slic3r::ExPolygons Slic3r::outer_inner_brim_area(const Print&, float, std::map<ObjectID, std::vector<ExPolygon> >&, std::map<ObjectID, std::vector<ExPolygon> >&, std::vector<std::pair<ObjectID, unsigned int> >&, std::vector<unsigned int>&)’:
src/libslic3r/Brim.cpp:1084:18: error: ‘spin_mutex’ is not a member of ‘tbb’
 1084 |             tbb::spin_mutex brimMutex;
      |                  ^~~~~~~~~~
In file included from src/libslic3r/FlushVolPredictor.cpp:1:
src/libslic3r/FlushVolPredictor.hpp:44:34: error: ‘string’ in namespace ‘std’ does not name a type
   44 |     FlushVolPredictor(const std::string& data_file);
      |                                  ^~~~~~

src/libslic3r/FlushVolPredictor.hpp:49:5: error: ‘uint64_t’ does not name a type
   49 |     uint64_t generate_hash_key(const RGB& from, const RGB& to);
      |     ^~~~~~~~

In file included from src/libslic3r/FlushVolPredictor.cpp:1:
src/libslic3r/FlushVolPredictor.hpp:44:34: error: ‘string’ in namespace ‘std’ does not name a type
   44 |     FlushVolPredictor(const std::string& data_file);
      |                                  ^~~~~~
src/libslic3r/Support/TreeSupport.cpp:3204:41: error: ‘format’ was not declared in this scope; did you mean ‘boost::format’?
 3204 |             BOOST_LOG_TRIVIAL(trace) << format("plan_layer_heights0 (%.2f,%.2f)->(%.2f,%.2f): ", z1, h1, z2, h2);
      |                                         ^~~~~~
      |                                         boost::format
src/slic3r/GUI/wxMediaCtrl3.h:80:10: error: ‘condition_variable’ in namespace ‘std’ does not name a type
   80 |     std::condition_variable m_cond;
      |          ^~~~~~~~~~~~~~~~~~
src/slic3r/GUI/wxMediaCtrl3.h:27:1: note: ‘std::condition_variable’ is defined in header ‘<condition_variable>’; did you forget to ‘#include <condition_variable>’?
   26 | #include "Printer/BambuTunnel.h"
  +++ |+#include <condition_variable>
   27 |
src/slic3r/GUI/wxMediaCtrl3.h:81:10: error: ‘thread’ in namespace ‘std’ does not name a type
   81 |     std::thread m_thread;
      |          ^~~~~~
src/slic3r/GUI/wxMediaCtrl3.h:27:1: note: ‘std::thread’ is defined in header ‘<thread>’; did you forget to ‘#include <thread>’?
   26 | #include "Printer/BambuTunnel.h"
  +++ |+#include <thread>
   27 |

In file included from src/slic3r/GUI/MediaPlayCtrl.h:17,
                 from src/slic3r/GUI/MediaPlayCtrl.cpp:1:
src/slic3r/GUI/wxMediaCtrl3.h:77:13: error: field ‘m_frame’ has incomplete type ‘wxImage’
   77 |     wxImage m_frame;
      |             ^~~~~~~
src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp: In member function ‘virtual void Slic3r::GUI::GLGizmoFlatten::on_render_input_window(float, float, float)’:
src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp:45:27: error: ‘wxDisplay’ was not declared in this scope; did you mean ‘wxGetDisplay’?
   45 |     double screen_scale = wxDisplay(wxGetApp().plater()).GetScaleFactor();
      |                           ^~~~~~~~~
      |                           wxGetDisplay
src/slic3r/GUI/BitmapCache.cpp: In static member function ‘static NSVGimage* Slic3r::GUI::BitmapCache::nsvgParseFromFileWithReplace(const char*, const char*, float, const std::map<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >&)’:
src/slic3r/GUI/BitmapCache.cpp:279:17: error: ‘boost::nowide’ has not been declared
  279 |     fp = boost::nowide::fopen(filename, "rb");
      |                 ^~~~~~
src/slic3r/GUI/MediaFilePanel.cpp: In lambda function:
src/slic3r/GUI/MediaFilePanel.cpp:508:49: error: ‘lexical_cast’ is not a member of ‘boost’
  508 |                 url += "&refresh_url=" + boost::lexical_cast<std::string>(&refresh_agora_url);
      |                                                 ^~~~~~~~~~~~
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp: In member function ‘void Slic3r::GUI::GLGizmoBrimEars::first_layer_slicer()’:
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp:870:27: error: ‘union_ex’ was not declared in this scope; did you mean ‘union’?
  870 |                 part_ex = union_ex(part_ex, sliced_layer);
      |                           ^~~~~~~~
      |                           union
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp:876:21: error: ‘diff_ex’ was not declared in this scope
  876 |     m_first_layer = diff_ex(part_ex, negative_ex);
      |                     ^~~~~~~
src/libslic3r/Format/STEP.hpp:39:41: error: ‘Model’ has not been declared
   39 | extern bool load_step(const char *path, Model *model,
      |                                         ^~~~~
src/slic3r/GUI/StepMeshDialog.hpp:40:10: error: ‘future’ in namespace ‘std’ does not name a template type
   40 |     std::future<unsigned int> task;
      |          ^~~~~~
src/slic3r/GUI/StepMeshDialog.hpp:8:1: note: ‘std::future’ is defined in header ‘<future>’; did you forget to ‘#include <future>’?
    7 | #include "Widgets/Button.hpp"
  +++ |+#include <future>
    8 | class Button;
In file included from src/slic3r/GUI/AVVideoDecoder.cpp:1:
src/slic3r/GUI/AVVideoDecoder.hpp:28:20: error: ‘wxImage’ has not been declared
   28 |     bool toWxImage(wxImage &image, wxSize const &size);
      |                    ^~~~~~~
src/slic3r/GUI/AVVideoDecoder.hpp:28:36: error: ‘wxSize’ has not been declared
   28 |     bool toWxImage(wxImage &image, wxSize const &size);
      |                                    ^~~~~~
src/slic3r/GUI/AVVideoDecoder.hpp:38:10: error: ‘vector’ in namespace ‘std’ does not name a template type
   38 |     std::vector<uint8_t> bits_;
      |          ^~~~~~
src/slic3r/GUI/AVVideoDecoder.hpp:9:1: note: ‘std::vector’ is defined in header ‘<vector>’; did you forget to ‘#include <vector>’?
    8 |     #include <libswscale/swscale.h>
  +++ |+#include <vector>
    9 | }

src/slic3r/GUI/AVVideoDecoder.cpp:145:89: error: invalid use of incomplete type ‘class wxBitmap’
  145 |     bitmap = wxBitmap((char const *) bits_.data(), size.GetWidth(), size.GetHeight(), 32);
      |                                                                                         ^
src/slic3r/GUI/wxMediaCtrl2.cpp: In lambda function:
src/slic3r/GUI/wxMediaCtrl2.cpp:170:13: error: ‘wxMessageBox’ was not declared in this scope; did you mean ‘wxInfoMessageBox’?
  170 |             wxMessageBox(_L("Your system is missing H.264 codecs for GStreamer, which are required to play video.  (Try installing the gstreamer1.0-plugins-bad or gstreamer1.0-libav packages, then restart Bambu Studio?)"), _L("Error"), wxOK);
      |             ^~~~~~~~~~~~
      |             wxInfoMessageBox
src/slic3r/GUI/wxMediaCtrl2.cpp: In member function ‘void wxMediaCtrl2::Load(wxURI)’:
src/slic3r/GUI/wxMediaCtrl2.cpp:179:5: error: ‘wxLog’ has not been declared
  179 |     wxLog::EnableLogging(false);
      |     ^~~~~
src/slic3r/GUI/wxMediaCtrl3.cpp: In member function ‘void wxMediaCtrl3::paintEvent(wxPaintEvent&)’:
src/slic3r/GUI/wxMediaCtrl3.cpp:121:5: error: ‘wxPaintDC’ was not declared in this scope; did you mean ‘wxPoint’?
  121 |     wxPaintDC dc(this);
      |     ^~~~~~~~~
      |     wxPoint
src/slic3r/GUI/wxMediaCtrl3.cpp:181:23: error: ‘info’ was not declared in this scope
  181 |     BOOST_LOG_TRIVIAL(info) << msg.ToUTF8().data();
      |                       ^~~~
src/slic3r/GUI/wxMediaCtrl3.cpp:181:5: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope
  181 |     BOOST_LOG_TRIVIAL(info) << msg.ToUTF8().data();
      |     ^~~~~~~~~~~~~~~~~
Signed-off-by: Filipe Laíns <[email protected]>
Co-authored-by: Andreas Rammhold <[email protected]>
jira: STUDIO-8464
Change-Id: I4bdfb89f8cfa94a1dd68427ab03072c42a8705bc
Change-Id: I28acf421ec0a21d14e89a498012029ee7a32f00b
jira: NONE

Signed-off-by: xun.zhang <[email protected]>
Change-Id: I7189a0a43736f45043f3600128db5aa03e2d2bfe
Non user versions can view debugging information through shortcut keys
jira: none

Change-Id: I251a6189e8909f4c52752827e359a7287bd15f7f
This reverts commit f54285d5b1bd73ca4686affd071fc6245935c17c.

Reason for revert: <revert>

Change-Id: Ib49549c5ee61e9f780905d28b4416308a61a837a
jira: nojira
Change-Id: Ic43f1279c8456bf6f00e9d6e4de737c6a84a0a12
Change-Id: I9dcaecb33ae75ec8e91b7c26746b75bf09d3c86b
XunZhangBambu and others added 26 commits October 30, 2024 01:49
jira: NONE

Signed-off-by: xun.zhang <[email protected]>
Change-Id: I9d1f1840e8d94e6dcbb9e00bf9cfa1aa67cba8bf
jira: STUDIO-8531
Change-Id: Ic4b13b253b8e2647f3bec78b5e9c698a18519285
Previously we moved X1 0.4 nozzle's purge line to the front for easier removal. Now we do this for all the other nozzles.

jira: none
Change-Id: If9c7980f33ae09575b830743d7d450cc38480aa4
Change-Id: I16a3f7b3afe142bb957a1740b8e8c9820c92b349
Jira: STUDIO-8522
and svg.This can reduce the preset differences in the copying system
jira:none

Change-Id: I6e6add2a9c796d8d42b7f8b7eccc1052250e5ffe
jira: none
Change-Id: I9b6113c815563cb2ded2c19b62286cdf6b509913
jira: none
Change-Id: I9a90344ac97f44445d3330c6734fac1372a1350e
jira: none
Change-Id: I39ebbb3de3f174a3072ab0511d2f6c9265264337
Change-Id: Ic95b59e207817f7f2c53fdbe23accbadabf73b25
Change-Id: Ic33607e22c45fae0d7d953983651178fbcc4fb06
Jira: XXXX
jira:NONE

Signed-off-by: xun.zhang <[email protected]>
Change-Id: I1081c9f1b31b39ed6772a2b4434a0fcd6472b621
JIRA: STUDIO-8116

Change-Id: I1e4d80cfb07c56fb8eb6b8dbd632d2edfb1100b0
Signed-off-by: Stone Li <[email protected]>
jira: STUDIO-8530
Change-Id: I43aeda64251165eaa2fc7f26b6dbaf548bc62057
jira: none
Change-Id: I521e27e7a4d12189efc77768d10d264d0d6db111
Jira: none

Signed-off-by: qing.zhang <[email protected]>
Change-Id: I26a814d0e187a5b4946889039959f723385ec40a
Change-Id: If6a1726d92a54eab20cffe84cd2831debb4b94ea
This reverts commit dc9d79efb2f55a4ed4e49e5c4190aa93bfacd2d5.

Reason for revert: <fixed in cloud >

Change-Id: I70cb2a91f0486bfbc11f610dbfeb8283a18cb630
Change-Id: Ic1bafa9f042acc757b6fd46d6382f6686de316d2
/run/build/BambuStudio/src/libslic3r/Support/SupportParameters.hpp: In constructor ‘Slic3r::SupportParameters::SupportParameters(const Slic3r::PrintObject&)’:
/run/build/BambuStudio/src/libslic3r/Support/SupportParameters.hpp:172:39: error: ‘warning’ was not declared in this scope
  172 |                     BOOST_LOG_TRIVIAL(warning) << "tree support default to organic support";
      |                                       ^~~~~~~
/run/build/BambuStudio/src/libslic3r/Support/SupportParameters.hpp:172:21: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope
  172 |                     BOOST_LOG_TRIVIAL(warning) << "tree support default to organic support";
      |                     ^~~~~~~~~~~~~~~~~
/run/build/BambuStudio/src/libslic3r/Support/SupportParameters.hpp:175:39: error: ‘warning’ was not declared in this scope
  175 |                     BOOST_LOG_TRIVIAL(warning) << "tree support default to hybrid tree due to adaptive layer height";
      |                                       ^~~~~~~
/run/build/BambuStudio/src/libslic3r/Support/SupportParameters.hpp:175:21: error: ‘BOOST_LOG_TRIVIAL’ was not declared in this scope
  175 |                     BOOST_LOG_TRIVIAL(warning) << "tree support default to hybrid tree due to adaptive layer height";
      |                     ^~~~~~~~~~~~~~~~~
@MackBambu MackBambu marked this pull request as draft October 30, 2024 09:06
@MackBambu MackBambu self-assigned this Oct 30, 2024
@tsmith35 tsmith35 closed this Oct 30, 2024
@tsmith35
Copy link
Author

@MackBambu added the pkgconfig into their build, so I will close this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.