Merge branch 'tm_opencsg'

This commit is contained in:
tamasmeszaros 2019-12-11 12:52:03 +01:00
commit 5b67ce5105
16 changed files with 42409 additions and 19 deletions

View file

@ -1,3 +1,4 @@
cmake_minimum_required(VERSION 3.8)
project(PrusaSlicer-native)
add_subdirectory(build-utils)
@ -133,13 +134,13 @@ target_link_libraries(PrusaSlicer libslic3r_gui ${wxWidgets_LIBRARIES})
if (MSVC)
# Generate debug symbols even in release mode.
target_link_options(PrusaSlicer PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
target_link_libraries(PrusaSlicer user32.lib Setupapi.lib OpenGL32.Lib GlU32.Lib)
target_link_libraries(PrusaSlicer user32.lib Setupapi.lib)
elseif (MINGW)
target_link_libraries(PrusaSlicer opengl32 ws2_32 uxtheme setupapi)
target_link_libraries(PrusaSlicer ws2_32 uxtheme setupapi)
elseif (APPLE)
target_link_libraries(PrusaSlicer "-framework OpenGL")
else ()
target_link_libraries(PrusaSlicer -ldl -lGL -lGLU)
target_link_libraries(PrusaSlicer -ldl)
endif ()
endif ()