Skip to content

Commit 273abe1

Browse files
committed
updated to Prusa 2.7 alpha1
2 parents e46b675 + e86cd23 commit 273abe1

File tree

1,176 files changed

+635819
-432469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,176 files changed

+635819
-432469
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
contact_links:
2-
- name: PrusaSlicer Manual and Support
2+
- name: Do you need Support?
3+
url: https://www.prusa3d.com/page/prusaslicer-support-form_233563/
4+
about: If you are not sure whether what you are reporting is a bug, please contact our support team first. We are providing full 24/7 customer support.
5+
- name: PrusaSlicer Manual
36
url: https://help.prusa3d.com/en/article/customer-support_2287/
4-
about: If you are not sure that what you are reporting is really a bug, please, consult the manual first.
7+
about: We have a comprehensive customer support page and help documentation that could be helpful for troubleshooting.
58
- name: PrusaPrinters Forum
69
url: https://forum.prusaprinters.org/forum/prusaslicer/
710
about: Please get in touch on our PrusaPrinters Community Forum! (Not an official support channel.)

CMakeLists.txt

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
#/|/ Copyright (c) Prusa Research 2017 - 2023 Tomáš Mészáros @tamasmeszaros, Vojtěch Bubník @bubnikv, Lukáš Matěna @lukasmatena, Filip Sykala @Jony01, Oleksandra Iushchenko @YuSanka, Lukáš Hejl @hejllukas, David Kocík @kocikdav, Enrico Turri @enricoturri1966, Vojtěch Král @vojtechkral
2+
#/|/ Copyright (c) 2023 Ben Greiner
3+
#/|/ Copyright (c) 2021 D-mo @dimitry-ishenko
4+
#/|/ Copyright (c) 2020 Pascal de Bruijn @pmjdebruijn
5+
#/|/ Copyright (c) 2019 Sam Segers
6+
#/|/ Copyright (c) 2019 Colin Gilgenbach @hexane360
7+
#/|/ Copyright (c) 2018 Dan Kortschak
8+
#/|/
9+
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
10+
#/|/
111
cmake_minimum_required(VERSION 3.13)
212
project(PrusaSlicer)
313

@@ -26,7 +36,6 @@ endif()
2636
option(SLIC3R_STATIC "Compile PrusaSlicer with static libraries (Boost, TBB, glew)" ${SLIC3R_STATIC_INITIAL})
2737
option(SLIC3R_GUI "Compile PrusaSlicer with GUI components (OpenGL, wxWidgets)" 1)
2838
option(SLIC3R_FHS "Assume PrusaSlicer is to be installed in a FHS directory structure" 0)
29-
option(SLIC3R_WX_STABLE "Build against wxWidgets stable (3.0) as oppsed to dev (3.1) on Linux" 0)
3039
option(SLIC3R_PCH "Use precompiled headers" 1)
3140
option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
3241
option(SLIC3R_MSVC_PDB "Generate PDB files on MSVC in Release mode" 1)
@@ -60,7 +69,6 @@ if (APPLE)
6069
endif ()
6170
endif ()
6271

63-
# Proposal for C++ unit tests and sandboxes
6472
option(SLIC3R_BUILD_SANDBOXES "Build development sandboxes" OFF)
6573
option(SLIC3R_BUILD_TESTS "Build unit tests" ON)
6674

@@ -177,24 +185,24 @@ if(WIN32)
177185
else()
178186
message("WIN10SDK_PATH is invalid: ${WIN10SDK_PATH}")
179187
message("${WIN10SDK_PATH}/include/winrt/windows.graphics.printing3d.h was not found")
180-
message("STL fixing by the Netfabb service will not be compiled")
188+
message("STL fixing by WinSDK will not be compiled")
181189
unset(WIN10SDK_PATH)
182190
endif()
183191
else()
184192
# Try to use the default Windows 10 SDK path.
185193
set(WIN10SDK_INCLUDE_PATH "$ENV{WindowsSdkDir}/Include/$ENV{WindowsSDKVersion}")
186194
if (NOT EXISTS "${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h")
187195
message("${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h was not found")
188-
message("STL fixing by the Netfabb service will not be compiled")
196+
message("STL fixing by WinSDK will not be compiled")
189197
unset(WIN10SDK_INCLUDE_PATH)
190198
endif()
191199
endif()
192200
if(WIN10SDK_INCLUDE_PATH)
193-
message("Building with Win10 Netfabb STL fixing service support")
201+
message("Building with Win10 STL fixing service support")
194202
add_definitions(-DHAS_WIN10SDK)
195203
include_directories("${WIN10SDK_INCLUDE_PATH}")
196204
else()
197-
message("Building without Win10 Netfabb STL fixing service support")
205+
message("Building without Win10 STL fixing service support")
198206
endif()
199207
endif()
200208

@@ -406,6 +414,7 @@ endif()
406414
set(TBB_DEBUG 1)
407415
find_package(TBB REQUIRED)
408416
slic3r_remap_configs(TBB::tbb RelWithDebInfo Release)
417+
slic3r_remap_configs(TBB::tbbmalloc RelWithDebInfo Release)
409418
# include_directories(${TBB_INCLUDE_DIRS})
410419
# add_definitions(${TBB_DEFINITIONS})
411420
# if(MSVC)
@@ -545,6 +554,7 @@ foreach(po_file ${L10N_PO_FILES})
545554
endforeach()
546555

547556
find_package(NLopt 1.4 REQUIRED)
557+
slic3r_remap_configs(NLopt::nlopt RelWithDebInfo Release)
548558

549559
if(SLIC3R_STATIC)
550560
set(OPENVDB_USE_STATIC_LIBS ON)

PrusaSlicer.mo

-244 KB
Binary file not shown.

build_win.bat

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
REM /|/ Copyright (c) 2022 Jebtrix @Jebtrix
2+
REM /|/ Copyright (c) 2021 Justin Schuh @jschuh
3+
REM /|/
4+
REM /|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
5+
REM /|/
16
@setlocal disableDelayedExpansion enableExtensions
27
@IF "%PS_ECHO_ON%" NEQ "" (echo on) ELSE (echo off)
38
@GOTO :MAIN

cmake-build-debug/.cmake/api/v1/query/cache-v2

Whitespace-only changes.

cmake-build-debug/.cmake/api/v1/query/cmakeFiles-v1

Whitespace-only changes.

cmake-build-debug/.cmake/api/v1/query/codemodel-v2

Whitespace-only changes.

cmake-build-debug/.cmake/api/v1/query/toolchains-v1

Whitespace-only changes.

0 commit comments

Comments
 (0)