Merge pull request #1 from prusa3d/master

Update fork to master.

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.13)
 project(PrusaSlicer)
 
 include("version.inc")
@@ -35,6 +35,11 @@ option(SLIC3R_ASAN "Enable ASan on Clang and GCC" 0)
 
 set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")
 
+if (APPLE)
+ set(CMAKE_FIND_FRAMEWORK LAST)
+ set(CMAKE_FIND_APPBUNDLE LAST)
+endif ()
+
 # Proposal for C++ unit tests and sandboxes
 option(SLIC3R_BUILD_SANDBOXES "Build development sandboxes" OFF)
 option(SLIC3R_BUILD_TESTS "Build unit tests" ON)
@@ -386,7 +391,7 @@ if (NOT EXPAT_FOUND)
  set(EXPAT_LIBRARIES expat)
 endif ()
 
-find_package(PNG)
+find_package(PNG REQUIRED)
 
 find_package(OpenGL REQUIRED)
 
@@ -506,7 +511,10 @@ if (WIN32)
 elseif (SLIC3R_FHS)
  set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/PrusaSlicer")
  install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${SLIC3R_FHS_RESOURCES}")
+ install(FILES src/platform/unix/PrusaSlicer.desktop DESTINATION ${SLIC3R_FHS_RESOURCES}/applications)
 else ()
+ install(FILES src/platform/unix/PrusaSlicer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
  install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 endif ()
+
 configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp)

README.md

@@ -12,7 +12,7 @@ compatible with any modern printer based on the RepRap toolchain, including all
 those based on the Marlin, Prusa, Sprinter and Repetier firmware. It also works
 with Mach3, LinuxCNC and Machinekit controllers.
 
-PrusaSlicer is based on [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranelucci and the RepRap community.
+PrusaSlicer is based on [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
 
 See the [project homepage](https://www.prusa3d.com/slic3r-prusa-edition/) and
 the [documentation directory](doc/) for more information.

deps/PNG/PNG.cmake

@@ -1,10 +1,16 @@
+set(_prefix_line "")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ set(_prefix_line "-DPNG_PREFIX=prusaslicer_")
+endif()
+
 prusaslicer_add_cmake_project(PNG 
  GIT_REPOSITORY https://github.com/glennrp/libpng.git 
  GIT_TAG v1.6.35
  DEPENDS ${ZLIB_PKG}
  CMAKE_ARGS
  -DPNG_SHARED=OFF
  -DPNG_STATIC=ON
+ ${_prefix_line}
  -DPNG_TESTS=OFF
 )
 

deps/deps-linux.cmake

@@ -3,10 +3,11 @@ set(DEP_CMAKE_OPTS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
 
 include("deps-unix-common.cmake")
 
-find_package(PNG QUIET)
-if (NOT PNG_FOUND)
- message(WARNING "No PNG dev package found in system, building static library. You should install the system package.")
-endif ()
+# Some Linuxes may have very old libpng, so it's best to bundle it instead of relying on the system version.
+# find_package(PNG QUIET)
+# if (NOT PNG_FOUND)
+# message(WARNING "No PNG dev package found in system, building static library. You should install the system package.")
+# endif ()
 
 #TODO UDEV
 

doc/How to build - Linux et al.md

@@ -56,6 +56,10 @@ This is done by passing this option to CMake:
 
 Note that PrusaSlicer is tested with wxWidgets 3.0 somewhat sporadically and so there may be bugs in bleeding edge releases.
 
+When building on ubuntu 20.04 focal fossa, the package libwxgtk3.0-gtk3-dev needs to be installed instead of libwxgtk3.0-dev and you should use:
+
+ -DSLIC3R_WX_STABLE=1 -DSLIC3R_GTK=3
+
 ### Build variant
 
 By default PrusaSlicer builds the release variant.

doc/How to build - Mac OS.md

@@ -79,3 +79,29 @@ This is set in the property list file
  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Info.plist
 
 To remove the limitation, simply delete the key `MinimumSDKVersion` from that file.
+
+
+# TL; DR
+
+Works on a fresh installation of MacOS Catalina 10.15.6
+
+- Install [brew](https://brew.sh/):
+- Open Terminal
+
+- Enter:
+
+```brew install cmake git gettext
+brew update
+brew upgrade
+git clone https://github.com/prusa3d/PrusaSlicer/
+cd PrusaSlicer/deps
+mkdir build
+cd build
+cmake ..
+make
+cd ../..
+mkdir build
+cd build
+cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local"
+make
+src/prusa-slicer

doc/How to build - Windows.md

@@ -125,11 +125,11 @@ intermediate files, which are not handled correctly by either `b2.exe` or possib
 # Noob guide (step by step)
 
 Install Visual Studio Community 2019 from
-visualstudio.microsoft.com/vs/
+[visualstudio.microsoft.com/vs/](https://visualstudio.microsoft.com/vs/)
 Select all workload options for C++ 
 
 Install git for Windows from
-gitforwindows.org
+[gitforwindows.org](https://gitforwindows.org/)
 download and run the exe accepting all defaults
 
 download PrusaSlicer-master.zip from github