|
 |
ed61608 |
Index: LuxCore-luxcorerender_v2.6/cmake/PlatformSpecific.cmake
|
|
 |
afb2113 |
===================================================================
|
|
|
ed61608 |
--- LuxCore-luxcorerender_v2.6.orig/cmake/PlatformSpecific.cmake
|
|
|
ed61608 |
+++ LuxCore-luxcorerender_v2.6/cmake/PlatformSpecific.cmake
|
|
|
ed61608 |
@@ -261,7 +261,7 @@
|
|
 |
52ef0b1 |
|
|
|
ed61608 |
IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
|
|
52ef0b1 |
# Update if necessary
|
|
|
52ef0b1 |
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wno-long-long -pedantic")
|
|
|
52ef0b1 |
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wno-long-long -pedantic")
|
|
|
52ef0b1 |
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -msse3 -mssse3")
|
|
|
52ef0b1 |
IF(NOT CYGWIN)
|
|
|
ed61608 |
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
|
|
|
ed61608 |
Index: LuxCore-luxcorerender_v2.6/CMakeLists.txt
|
|
|
afb2113 |
===================================================================
|
|
|
ed61608 |
--- LuxCore-luxcorerender_v2.6.orig/CMakeLists.txt
|
|
|
ed61608 |
+++ LuxCore-luxcorerender_v2.6/CMakeLists.txt
|
|
|
afb2113 |
@@ -42,6 +42,10 @@ unset(CMAKE_CONFIGURATION_TYPES CACHE)
|
|
|
52ef0b1 |
enable_language(C)
|
|
|
52ef0b1 |
enable_language(CXX)
|
|
|
52ef0b1 |
|
|
|
52ef0b1 |
+# Use C++ standard 14
|
|
|
52ef0b1 |
+set(CMAKE_CXX_STANDARD 14)
|
|
|
52ef0b1 |
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
52ef0b1 |
+
|
|
|
52ef0b1 |
if (CMAKE_CONFIGURATION_TYPES)
|
|
|
52ef0b1 |
|
|
|
52ef0b1 |
message(STATUS "Multi-config generator detected")
|
|
|
ed61608 |
Index: LuxCore-luxcorerender_v2.6/src/slg/engines/bakecpu/bakecputhread.cpp
|
|
|
afb2113 |
===================================================================
|
|
|
ed61608 |
--- LuxCore-luxcorerender_v2.6.orig/src/slg/engines/bakecpu/bakecputhread.cpp
|
|
|
ed61608 |
+++ LuxCore-luxcorerender_v2.6/src/slg/engines/bakecpu/bakecputhread.cpp
|
|
|
afb2113 |
@@ -352,7 +352,7 @@ void BakeCPURenderThread::RenderLightSam
|
|
|
52ef0b1 |
const PathTracer &pathTracer = engine->pathTracer;
|
|
|
52ef0b1 |
|
|
|
52ef0b1 |
const PathTracer::ConnectToEyeCallBackType connectToEyeCallBack = boost::bind(
|
|
|
c2a5af9 |
- &BakeCPURenderThread::RenderConnectToEyeCallBack, this, mapInfo, _1, _2, _3, _4, _5);
|
|
|
c2a5af9 |
+ &BakeCPURenderThread::RenderConnectToEyeCallBack, this, mapInfo, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5);
|
|
|
52ef0b1 |
|
|
|
52ef0b1 |
pathTracer.RenderLightSample(state.device, state.scene, state.film, state.lightSampler,
|
|
|
52ef0b1 |
state.lightSampleResults, connectToEyeCallBack);
|