Merge pull request #1289 from thomthom/dev-clang-windows

Corrections to allow for LLVM Clang builds on Windows.

CMakeLists.txt

@@ -171,6 +171,15 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANGCC OR CMAKE_COMPILER_IS_IC
         list(APPEND OSD_COMPILER_FLAGS -Wall -Wextra)
     endif()
 
+    if(WIN32)
+        # Make sure the constants in <math.h>/<cmath> get defined.
+        list(APPEND OSD_COMPILER_FLAGS -D_USE_MATH_DEFINES)
+
+        # Make sure WinDef.h does not define min and max macros which
+        # will conflict with std::min() and std::max().
+        list(APPEND OSD_COMPILER_FLAGS -DNOMINMAX)
+    endif()
+
     # HBR uses the offsetof macro on a templated struct, which appears
     # to spuriously set off this warning in both gcc and Clang
     list(APPEND OSD_COMPILER_FLAGS -Wno-invalid-offsetof)

examples/common/stopwatch.h

@@ -25,7 +25,7 @@
 #ifndef STOPWATCH_H
 #define STOPWATCH_H
 
-#if (_WIN32 || _WIN64)
+#if (_WIN32)
     #include <windows.h>
 #else
     #include <sys/types.h>
@@ -37,7 +37,7 @@ class Stopwatch {
 
 public:
 
-#ifndef _WINDOWS
+#ifndef _WIN32
     Stopwatch() : _totalElapsed(0) { }
 
     void Start() {
@@ -91,7 +91,7 @@ public:
 
 private:
 
-#ifndef _WINDOWS
+#ifndef _WIN32
     double _elapsed;
     double _totalElapsed;
 #else