GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-13 14:58:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix macos10 build

Browse Source 
using 10.13 as min sdk
This commit is contained in:
supermerill 2020-01-12 21:28:51 +01:00
parent 15a65af75d
commit 2c287a1186
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ccpp_mac.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
run: mkdir deps/build
- name: cmake deps
working-directory: ./deps/build
run: cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14"
run: cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13"
- name: make deps
working-directory: ./deps/build
run: make
@ -29,7 +29,7 @@ jobs:
run: mkdir build
- name: cmake
working-directory: ./build
run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" -DSLIC3R_STATIC=1
run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DSLIC3R_STATIC=1
- name: make slic3r
working-directory: ./build
run: make slic3r

7
src/slic3r/GUI/Tab.cpp
View File

@ -23,7 +23,10 @@
#include <wx/settings.h>
#include <wx/filedlg.h>
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/path.hpp>
#include "wxExtensions.hpp"
#include <wx/wupdlock.h>
@ -1035,8 +1038,8 @@ bool Tab::create_pages(std::string setting_type_name)
{
std::cout << "create settings " << setting_type_name << "\n";
//search for the file
const auto ui_layout_file = (boost::filesystem::path(resources_dir()) / "ui_layout" / setting_type_name).make_preferred();
if (!boost::filesystem::exists(ui_layout_file)) return false;
const boost::filesystem::path ui_layout_file = (boost::filesystem::path(resources_dir()) / "ui_layout" / setting_type_name).make_preferred();
if (! boost::filesystem::exists(ui_layout_file)) return false;
Slic3r::GUI::PageShp current_page;
ConfigOptionsGroupShp current_group;