Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/master_262' into feature…
Browse files Browse the repository at this point in the history
…-single-wall-top
  • Loading branch information
bubnikv committed Sep 18, 2023
2 parents eafb594 + 0cbbe96 commit 9ac3d0f
Show file tree
Hide file tree
Showing 859 changed files with 111,309 additions and 98,986 deletions.
11 changes: 10 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
#/|/ 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
#/|/ Copyright (c) 2023 Ben Greiner
#/|/ Copyright (c) 2021 D-mo @dimitry-ishenko
#/|/ Copyright (c) 2020 Pascal de Bruijn @pmjdebruijn
#/|/ Copyright (c) 2019 Sam Segers
#/|/ Copyright (c) 2019 Colin Gilgenbach @hexane360
#/|/ Copyright (c) 2018 Dan Kortschak
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
cmake_minimum_required(VERSION 3.13)
project(PrusaSlicer)

Expand Down Expand Up @@ -59,7 +69,6 @@ if (APPLE)
endif ()
endif ()

# Proposal for C++ unit tests and sandboxes
option(SLIC3R_BUILD_SANDBOXES "Build development sandboxes" OFF)
option(SLIC3R_BUILD_TESTS "Build unit tests" ON)

Expand Down
5 changes: 5 additions & 0 deletions build_win.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
REM /|/ Copyright (c) 2022 Jebtrix @Jebtrix
REM /|/ Copyright (c) 2021 Justin Schuh @jschuh
REM /|/
REM /|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
REM /|/
@setlocal disableDelayedExpansion enableExtensions
@IF "%PS_ECHO_ON%" NEQ "" (echo on) ELSE (echo off)
@GOTO :MAIN
Expand Down
4 changes: 4 additions & 0 deletions deps/Blosc/Blosc.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
if(BUILD_SHARED_LIBS)
set(_build_shared ON)
set(_build_static OFF)
Expand Down
4 changes: 4 additions & 0 deletions deps/Boost/Boost.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01, Lukáš Hejl @hejllukas, Enrico Turri @enricoturri1966
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
include(ExternalProject)

if (WIN32)
Expand Down
4 changes: 4 additions & 0 deletions deps/CGAL/CGAL.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2019 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01, Vojtěch Bubník @bubnikv, David Kocík @kocikdav
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
prusaslicer_add_cmake_project(
CGAL
# GIT_REPOSITORY https://github.com/CGAL/cgal.git
Expand Down
4 changes: 4 additions & 0 deletions deps/CGAL/cgal/CGALConfigVersion.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2020 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
# This is a basic version file for the Config-mode of find_package().
# It is used by write_basic_package_version_file() as input file for configure_file()
# to create a version-file which can be installed along a config.cmake file.
Expand Down
13 changes: 12 additions & 1 deletion deps/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2018 - 2022 Lukáš Matěna @lukasmatena, Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01, Vojtěch Bubník @bubnikv, Vojtěch Král @vojtechkral
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
#
# This CMake project downloads, configures and builds PrusaSlicer dependencies on Unix and Windows.
#
Expand All @@ -20,8 +24,8 @@
# therefore, unfortunatelly, the installation cannot be copied/moved elsewhere without re-installing wxWidgets.
#

cmake_minimum_required(VERSION 3.10)
project(PrusaSlicer-deps)
cmake_minimum_required(VERSION 3.2)

include(ExternalProject)
include(ProcessorCount)
Expand Down Expand Up @@ -62,6 +66,10 @@ if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE)
message(STATUS "Forcing CMAKE_BUILD_TYPE to Release as it was not specified.")
endif ()

if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
cmake_policy(SET CMP0135 NEW)
endif ()

function(prusaslicer_add_cmake_project projectname)
cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN})

Expand Down Expand Up @@ -195,6 +203,8 @@ include(NanoSVG/NanoSVG.cmake)
include(wxWidgets/wxWidgets.cmake)
include(OCCT/OCCT.cmake)

include(LibBGCode/LibBGCode.cmake)

set(_dep_list
dep_Boost
dep_TBB
Expand All @@ -210,6 +220,7 @@ set(_dep_list
${PNG_PKG}
${ZLIB_PKG}
${EXPAT_PKG}
dep_LibBGCode
)

# if (NOT MSVC)
Expand Down
4 changes: 4 additions & 0 deletions deps/CURL/CURL.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
set(_curl_platform_flags
-DENABLE_IPV6:BOOL=ON
-DENABLE_VERSIONED_SYMBOLS:BOOL=ON
Expand Down
4 changes: 4 additions & 0 deletions deps/Cereal/Cereal.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
prusaslicer_add_cmake_project(Cereal
URL "https://github.com/USCiLab/cereal/archive/refs/tags/v1.3.0.zip"
URL_HASH SHA256=71642cb54658e98c8f07a0f0d08bf9766f1c3771496936f6014169d3726d9657
Expand Down
4 changes: 4 additions & 0 deletions deps/EXPAT/EXPAT.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2020 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
#prusaslicer_add_cmake_project(EXPAT
# # GIT_REPOSITORY https://github.com/nigels-com/glew.git
# # GIT_TAG 3a8eff7 # 2.1.0
Expand Down
4 changes: 4 additions & 0 deletions deps/GLEW/GLEW.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2019 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
# We have to check for OpenGL to compile GLEW
set(OpenGL_GL_PREFERENCE "LEGACY") # to prevent a nasty warning by cmake
find_package(OpenGL QUIET REQUIRED)
Expand Down
4 changes: 4 additions & 0 deletions deps/GMP/GMP.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2019 - 2021 Tomáš Mészáros @tamasmeszaros, David Kocík @kocikdav
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/

set(_srcdir ${CMAKE_CURRENT_LIST_DIR}/gmp)
set(_dstdir ${DESTDIR}/usr/local)
Expand Down
4 changes: 4 additions & 0 deletions deps/JPEG/JPEG.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
prusaslicer_add_cmake_project(JPEG
URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.0.6.zip
URL_HASH SHA256=017bdc33ff3a72e11301c0feb4657cb27719d7f97fa67a78ed506c594218bbf1
Expand Down
34 changes: 34 additions & 0 deletions deps/LibBGCode/LibBGCode.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
set(LibBGCode_SOURCE_DIR "" CACHE PATH "Optionally specify local LibBGCode source directory")

set(_source_dir_line
URL https://github.com/prusa3d/libbgcode/archive/50bedae2ae0c7fc83dd350a8be99ddc8f1749005.zip
URL_HASH SHA256=3958c93a325d6d7ed1c97aabb37cc09a08f8e981e3a7917312d568071e462162
)

if (LibBGCode_SOURCE_DIR)
set(_source_dir_line "SOURCE_DIR;${LibBGCode_SOURCE_DIR};BUILD_ALWAYS;ON")
endif ()

prusaslicer_add_cmake_project(LibBGCode_deps
${_source_dir_line}
SOURCE_SUBDIR deps
DEPENDS dep_Boost ${ZLIB_PKG}
CMAKE_ARGS
-DDEP_DOWNLOAD_DIR:PATH=${DEP_DOWNLOAD_DIR}
-DDEP_CMAKE_OPTS:STRING=-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
-DLibBGCode_Deps_SELECT_ALL:BOOL=OFF
-DLibBGCode_Deps_SELECT_heatshrink:BOOL=ON
-DDESTDIR=${DESTDIR}
)

prusaslicer_add_cmake_project(LibBGCode
${_source_dir_line}
DEPENDS dep_LibBGCode_deps
CMAKE_ARGS
-DLibBGCode_BUILD_TESTS:BOOL=OFF
-DLibBGCode_BUILD_CMD_TOOL:BOOL=OFF
)

if (MSVC)
add_debug_dep(dep_LibBGCode)
endif ()
4 changes: 4 additions & 0 deletions deps/MPFR/MPFR.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2019 - 2021 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
set(_srcdir ${CMAKE_CURRENT_LIST_DIR}/mpfr)
set(_dstdir ${DESTDIR}/usr/local)

Expand Down
4 changes: 4 additions & 0 deletions deps/MPFR/mpfr/include/mpf2mpfr.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
///|/ Copyright (c) Prusa Research 2019 Tomáš Mészáros @tamasmeszaros
///|/
///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
///|/
/* mpf2mpfr.h -- Compatibility include file with mpf.
Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
Expand Down
4 changes: 4 additions & 0 deletions deps/MPFR/mpfr/include/mpfr.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
///|/ Copyright (c) Prusa Research 2019 Tomáš Mészáros @tamasmeszaros
///|/
///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
///|/
/* mpfr.h -- Include file for mpfr.
Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
Expand Down
4 changes: 4 additions & 0 deletions deps/NLopt/NLopt.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
prusaslicer_add_cmake_project(NLopt
URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz"
URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
Expand Down
4 changes: 4 additions & 0 deletions deps/NanoSVG/NanoSVG.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2022 - 2023 Enrico Turri @enricoturri1966, Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
# In PrusaSlicer 2.6.0 we switched from https://github.com/memononen/nanosvg to its fork https://github.com/fltk/nanosvg
# because this last implements the new function nsvgRasterizeXY() which we now use in GLTexture::load_from_svg()
# for rasterizing svg files from their original size to a squared power of two texture on Windows systems using
Expand Down
4 changes: 4 additions & 0 deletions deps/OCCT/OCCT.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2022 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
prusaslicer_add_cmake_project(OCCT
#LMBBS: changed version to 7.6.2
URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_2.zip
Expand Down
4 changes: 4 additions & 0 deletions deps/OCCT/occt_toolkit.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2022 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
# script for each OCCT toolkit

# filling some variables by default values(src) or using custom(tools, samples)
Expand Down
4 changes: 4 additions & 0 deletions deps/OpenCSG/OpenCSG.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2019 - 2021 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/

prusaslicer_add_cmake_project(OpenCSG
# GIT_REPOSITORY https://github.com/floriankirsch/OpenCSG.git
Expand Down
5 changes: 5 additions & 0 deletions deps/OpenEXR/OpenEXR.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#/|/ Copyright (c) Prusa Research 2021 - 2023 Lukáš Matěna @lukasmatena, Tomáš Mészáros @tamasmeszaros
#/|/ Copyright (c) 2023 Robert Schiele @schiele
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
prusaslicer_add_cmake_project(OpenEXR
# GIT_REPOSITORY https://github.com/openexr/openexr.git
URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
Expand Down
4 changes: 4 additions & 0 deletions deps/OpenSSL/OpenSSL.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/

include(ProcessorCount)
ProcessorCount(NPROC)
Expand Down
4 changes: 4 additions & 0 deletions deps/OpenVDB/OpenVDB.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
if(BUILD_SHARED_LIBS)
set(_build_shared ON)
set(_build_static OFF)
Expand Down
4 changes: 4 additions & 0 deletions deps/PNG/PNG.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2020 - 2021 Tomáš Mészáros @tamasmeszaros, Vojtěch Bubník @bubnikv
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
if (APPLE)
# Only disable NEON extension for Apple ARM builds, leave it enabled for Raspberry PI.
set(_disable_neon_extension "-DPNG_ARM_NEON=off")
Expand Down
4 changes: 4 additions & 0 deletions deps/Qhull/Qhull.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
include(GNUInstallDirs)
prusaslicer_add_cmake_project(Qhull
URL "https://github.com/qhull/qhull/archive/v8.0.1.zip"
Expand Down
4 changes: 4 additions & 0 deletions deps/TBB/TBB.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 - 2022 Tomáš Mészáros @tamasmeszaros, Filip Sykala @Jony01
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
prusaslicer_add_cmake_project(
TBB
URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.5.0.zip"
Expand Down
4 changes: 4 additions & 0 deletions deps/TIFF/TIFF.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2021 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
find_package(OpenGL QUIET REQUIRED)

prusaslicer_add_cmake_project(TIFF
Expand Down
4 changes: 4 additions & 0 deletions deps/ZLIB/ZLIB.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2019 - 2021 Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
prusaslicer_add_cmake_project(ZLIB
# GIT_REPOSITORY https://github.com/madler/zlib.git
# GIT_TAG v1.2.11
Expand Down
4 changes: 4 additions & 0 deletions deps/deps-linux.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2018 - 2021 Tomáš Mészáros @tamasmeszaros, Vojtěch Bubník @bubnikv, Vojtěch Král @vojtechkral, David Kocík @kocikdav
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/

set(DEP_CMAKE_OPTS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")

Expand Down
5 changes: 5 additions & 0 deletions deps/deps-macos.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#/|/ Copyright (c) Prusa Research 2018 - 2022 Tomáš Mészáros @tamasmeszaros, Vojtěch Bubník @bubnikv, Oleksandra Iushchenko @YuSanka, Vojtěch Král @vojtechkral
#/|/ Copyright (c) 2020 Bertrand Giot @bgiot
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/

# This ensures dependencies don't use SDK features which are not available in the version specified by Deployment target
# That can happen when one uses a recent SDK but specifies an older Deployment target
Expand Down
4 changes: 4 additions & 0 deletions deps/deps-mingw.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2019 - 2021 Tomáš Mészáros @tamasmeszaros, Vojtěch Bubník @bubnikv
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
set(DEP_CMAKE_OPTS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
set(DEP_BOOST_TOOLSET "gcc")
set(DEP_BITS 64)
Expand Down
4 changes: 4 additions & 0 deletions deps/deps-unix-common.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2018 - 2021 Tomáš Mészáros @tamasmeszaros, Vojtěch Král @vojtechkral, Vojtěch Bubník @bubnikv
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/

# The unix common part expects DEP_CMAKE_OPTS to be set

Expand Down
4 changes: 4 additions & 0 deletions deps/deps-windows.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#/|/ Copyright (c) Prusa Research 2018 - 2021 Enrico Turri @enricoturri1966, Tomáš Mészáros @tamasmeszaros, Vojtěch Bubník @bubnikv, Vojtěch Král @vojtechkral
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
# https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
if (MSVC_VERSION EQUAL 1800)
# 1800 = VS 12.0 (v120 toolset)
Expand Down
5 changes: 5 additions & 0 deletions deps/wxWidgets/wxWidgets.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#/|/ Copyright (c) Prusa Research 2020 - 2023 Oleksandra Iushchenko @YuSanka, Lukáš Matěna @lukasmatena, Tomáš Mészáros @tamasmeszaros, Lukáš Hejl @hejllukas, Vojtěch Bubník @bubnikv
#/|/ Copyright (c) 2020 Bertrand Giot @bgiot
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
set(_wx_toolkit "")
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(_gtk_ver 2)
Expand Down
2 changes: 1 addition & 1 deletion doc/Localization_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Each string resource in PrusaSlicer available for translation needs to be explic
```C++
auto msg = L("This message to be localized")
```
To get translated text use one of needed macro/function (`_(s)` or `_CHB(s)` ).
To get translated text use needed macro/function (`_(s)`).
If you add new file resource, add it to the list of files containing macro `L()`

### Scenario 4. How do I use GNUgettext to localize my own application taking PrusaSlicer as an example
Expand Down
10 changes: 10 additions & 0 deletions lib/Slic3r.pm
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
#/|/ Copyright (c) Prusa Research 2016 - 2022 Vojtěch Bubník @bubnikv, Tomáš Mészáros @tamasmeszaros, Vojtěch Král @vojtechkral, Oleksandra Iushchenko @YuSanka
#/|/ Copyright (c) 2018 Martin Loidl @LoidlM
#/|/ Copyright (c) Slic3r 2011 - 2016 Alessandro Ranellucci @alranel
#/|/ Copyright (c) 2012 Henrik Brix Andersen @henrikbrixandersen
#/|/ Copyright (c) 2012 Mark Hindess
#/|/ Copyright (c) 2012 Michael Moon
#/|/ Copyright (c) 2011 Clarence Risher
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
# This package loads all the non-GUI Slic3r perl packages.

package Slic3r;
Expand Down

0 comments on commit 9ac3d0f

Please sign in to comment.