3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-22 16:21:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Add PNG and wxWidgets 3.1.3 uniformly to all platforms with cmake build.

Browse source 
wx is built with png as a dependency, wxpng is disabled.
This commit is contained in:
tamasmeszaros 2020-04-28 09:56:54 +02:00
parent 2bd524849a
commit 572b5ba8bb
37 changed files with 13948 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -59,6 +59,10 @@ if (SLIC3R_GUI)
include(${wxWidgets_USE_FILE})
list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX png)
list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX expat)
list(APPEND wxWidgets_LIBRARIES ${PNG_LIBRARIES} ${EXPAT_LIBRARIES})
# list(REMOVE_ITEM wxWidgets_LIBRARIES oleacc)
message(STATUS "wx libs: ${wxWidgets_LIBRARIES}")