GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-11 20:49:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed the --gui parameter from the slic3r wrapper.

Browse Source 
Fixed the perl bindings
This commit is contained in:
bubnikv 2019-03-13 17:06:45 +01:00
parent 96d88e550e
commit cea6ca83db
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -153,12 +153,12 @@ endif ()
# Also the shim may load the Mesa software OpenGL renderer if the default renderer does not support OpenGL 2.0 and higher. # Also the shim may load the Mesa software OpenGL renderer if the default renderer does not support OpenGL 2.0 and higher.
if (MSVC) if (MSVC)
add_executable(slic3r_app_gui WIN32 slic3r_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc) add_executable(slic3r_app_gui WIN32 slic3r_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc)
target_compile_definitions(slic3r_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE -DSLIC3R_WRAPPER_GUI) target_compile_definitions(slic3r_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
add_dependencies(slic3r_app_gui slic3r) add_dependencies(slic3r_app_gui slic3r)
set_target_properties(slic3r_app_gui PROPERTIES OUTPUT_NAME "slic3r") set_target_properties(slic3r_app_gui PROPERTIES OUTPUT_NAME "slic3r")
add_executable(slic3r_app_console slic3r_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc) add_executable(slic3r_app_console slic3r_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/slic3r.rc)
target_compile_definitions(slic3r_app_console PRIVATE -DSLIC3R_WRAPPER_CONSOLE -DSLIC3R_WRAPPER_NOGUI) target_compile_definitions(slic3r_app_console PRIVATE -DSLIC3R_WRAPPER_CONSOLE)
add_dependencies(slic3r_app_console slic3r) add_dependencies(slic3r_app_console slic3r)
set_target_properties(slic3r_app_console PROPERTIES OUTPUT_NAME "slic3r-console") set_target_properties(slic3r_app_console PROPERTIES OUTPUT_NAME "slic3r-console")
endif () endif ()

7
src/slic3r_app_msvc.cpp
View File

@ -206,11 +206,8 @@ int wmain(int argc, wchar_t **argv)
std::vector<wchar_t*> argv_extended; std::vector<wchar_t*> argv_extended;
argv_extended.emplace_back(argv[0]); argv_extended.emplace_back(argv[0]);
#ifdef SLIC3R_WRAPPER_GUI // Here one may push some additional parameters based on the wrapper type.
std::wstring cmd_gui = L"--gui"; for (int i = 1; i < argc; ++ i)
argv_extended.emplace_back(const_cast<wchar_t*>(cmd_gui.data()));
#endif
for (int i = 1; i < argc; ++i)
argv_extended.emplace_back(argv[i]); argv_extended.emplace_back(argv[i]);
argv_extended.emplace_back(nullptr); argv_extended.emplace_back(nullptr);

2
xs/src/perlglue.cpp
View File

@ -251,7 +251,7 @@ bool ConfigBase__set(ConfigBase* THIS, const t_config_option_key &opt_key, SV* v
case coPoint: case coPoint:
return from_SV_check(value, &static_cast<ConfigOptionPoint*>(opt)->value); return from_SV_check(value, &static_cast<ConfigOptionPoint*>(opt)->value);
case coPoint3: case coPoint3:
return from_SV_check(value, &static_cast<ConfigOptionPoint3*>(&opt)->value); return from_SV_check(value, &static_cast<ConfigOptionPoint3*>(opt)->value);
case coPoints: case coPoints:
{ {
std::vector<Vec2d> &values = static_cast<ConfigOptionPoints*>(opt)->values; std::vector<Vec2d> &values = static_cast<ConfigOptionPoints*>(opt)->values;