diff options
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_path.cpp | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 179cba2ae5f..d3ab894e44a 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -202,8 +202,10 @@ endif() if(CMAKE_COMPILER_IS_GNUCXX) ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_float_conversion "-Werror=float-conversion") ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_cxxflag_double_promotion "-Werror=double-promotion") + ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS _has_no_error_unused_macros "-Wno-error=unused-macros") unset(_has_cxxflag_float_conversion) unset(_has_cxxflag_double_promotion) + unset(_has_no_error_unused_macros) endif() diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index 04a2282ec77..b7aa24a831f 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -34,14 +34,9 @@ OIIO_NAMESPACE_USING # include <direct.h> #else # define DIR_SEP '/' -# define DIR_SEP_ALT '\\' # include <dirent.h> #endif -#if defined(DIR_SEP_ALT) -/* quiet unused define warning */ -#endif - #ifdef HAVE_SHLWAPI_H # include <shlwapi.h> #endif |