It compiles with clang on windows as well

Author: U-tub\kreijstal

src/ode/ode/src/util.cpp

@@ -646,7 +646,7 @@ void dxWorldProcessMemArena::FreeMemArena (dxWorldProcessMemArena *arena)
 size_t dxWorldProcessMemArena::AdjustArenaSizeForReserveRequirements(size_t arenareq, float rsrvfactor, unsigned rsrvminimum)
 {
     float scaledarena = arenareq * rsrvfactor;
-    size_t adjustedarena = (scaledarena < SIZE_MAX) ? (size_t)scaledarena : SIZE_MAX;
+    size_t adjustedarena = (scaledarena < (float)SIZE_MAX) ? (size_t)scaledarena : SIZE_MAX;
     size_t boundedarena = (adjustedarena > rsrvminimum) ? adjustedarena : (size_t)rsrvminimum;
     return dEFFICIENT_SIZE(boundedarena);
 }

src/webots/CMakeLists.txt

@@ -15,7 +15,10 @@ if(WIN32)
     add_definitions(-DUNICODE -D_UNICODE)
 endif()
 # Set visibility settings globally
-add_compile_options(-fvisibility=default -fno-gnu-unique)
+add_compile_options(-fvisibility=default)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_compile_options(-fno-gnu-unique)
+endif()
 
 # Add cmake modules
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

src/webots/nodes/CMakeLists.txt

@@ -6,8 +6,10 @@ target_compile_options(nodes_lib
     PUBLIC
     -frtti
     -fvisibility=default
-    -fno-gnu-unique
 )
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_compile_options(-fno-gnu-unique)
+endif()
 
 # Find STB headers
 find_path(STB_INCLUDE_DIR

src/webots/nodes/utils/CMakeLists.txt

@@ -13,8 +13,10 @@ target_compile_options(nodes_utils_lib
     PUBLIC
     -frtti
     -fvisibility=default
-    -fno-gnu-unique
 )
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_compile_options(-fno-gnu-unique)
+endif()
 
 # Set position independent code
 set_property(TARGET nodes_utils_lib PROPERTY POSITION_INDEPENDENT_CODE ON)

src/webots/nodes/utils/WbVirtualRealityHeadset.cpp

@@ -41,7 +41,7 @@
 #include <wren/viewport.h>
 
 #include <openvr.h>
-#include <openvr_capi.h>
+//#include <openvr_capi.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QStandardPaths>

src/webots/vrml/WbNodeReader.cpp

@@ -109,7 +109,8 @@ WbNode *WbNodeReader::createNode(const QString &modelName, WbTokenizer *tokenize
     tokenizer->reportError(QObject::tr("Skipped unknown '%1' node or PROTO").arg(modelName));
   else
    // qDebug() << "WbNodeReader::createNode: Cannot report error, tokenizer is NULL for unknown model:" << modelName;
-  return NULL;
+   return NULL;
+ return NULL;
 }
 
 WbNode *WbNodeReader::readNode(WbTokenizer *tokenizer, const QString &worldPath) {