File tree 1 file changed +2
-4
lines changed
1 file changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -166,7 +166,6 @@ if (WIN32)
166
166
# "VCRUNTIME140.dll not found. Try reinstalling the app.", but give users
167
167
# a choice to opt for the shared runtime if they want.
168
168
option (USE_STATIC_CRT "Link against the static runtime libraries." ON )
169
- set (CMAKE_CXX_STANDARD 20)
170
169
171
170
# On Windows we need to instruct cmake to generate the .def in order to get the .lib required
172
171
# when linking against dlls. CL.EXE will not generate .lib without .def file (or without pragma
@@ -283,11 +282,11 @@ endif()
283
282
# ==================================================================================================
284
283
set (CXX_STANDARD "-std=c++17" )
285
284
if (WIN32 )
286
- set (CXX_STANDARD "/std:c++17 " )
285
+ set (CXX_STANDARD "/std:c++20 " )
287
286
endif ()
288
287
289
288
if (MSVC )
290
- set (CXX_STANDARD "/std:c++latest " )
289
+ set (CXX_STANDARD "/std:c++20 " )
291
290
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} /W0 /Zc:__cplusplus" )
292
291
else ()
293
292
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_STANDARD} -fstrict-aliasing -Wno-unknown-pragmas -Wno-unused-function -Wno-deprecated-declarations" )
@@ -453,7 +452,6 @@ endif()
453
452
454
453
# By default, build with Vulkan support on desktop platforms, although clients must request to use
455
454
# it at run time.
456
- # if (WIN32 OR WEBGL OR IOS)
457
455
if (WEBGL OR IOS)
458
456
option (FILAMENT_SUPPORTS_VULKAN "Include the Vulkan backend" OFF )
459
457
else ()
You can’t perform that action at this time.
0 commit comments