diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-02-13 17:04:30 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-02-13 17:04:30 +0300 |
| commit | 6022cd015ffe414b60229ba214dc1e324772e22d (patch) | |
| tree | cdff8a4419dd3d9c208f3a137eb3f8971d9a383c /intern | |
| parent | d1cd3ec9babd8090089a4c7df6b55573adb1aa48 (diff) | |
Revert "Cleanup/MSVC: Enable C++ conformance mode on compiler versions that support it."
It is breaking compilation on some configurations, revert for now while
i see what is wrong.
This reverts commit 9fe469c110940af5d2525158305d5d365bd15276.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_ContextWGL.cpp | 24 | ||||
| -rw-r--r-- | intern/mantaflow/CMakeLists.txt | 5 |
2 files changed, 10 insertions, 19 deletions
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp index 6d5d4f75351..d4851450ce8 100644 --- a/intern/ghost/intern/GHOST_ContextWGL.cpp +++ b/intern/ghost/intern/GHOST_ContextWGL.cpp @@ -647,11 +647,9 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext() /* Silence warnings interpreted as errors by users when trying to get * a context with version higher than 3.3 Core. */ - { - const bool silent = m_contextMajorVersion > 3; - if (!WIN32_CHK_SILENT(m_hGLRC != NULL, silent)) { - goto error; - } + const bool silent = m_contextMajorVersion > 3; + if (!WIN32_CHK_SILENT(m_hGLRC != NULL, silent)) { + goto error; } s_sharedCount++; @@ -682,17 +680,15 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext() ::SwapBuffers(m_hDC); #ifndef NDEBUG - { - const char *vendor = reinterpret_cast<const char *>(glGetString(GL_VENDOR)); - const char *renderer = reinterpret_cast<const char *>(glGetString(GL_RENDERER)); - const char *version = reinterpret_cast<const char *>(glGetString(GL_VERSION)); + const char *vendor = reinterpret_cast<const char *>(glGetString(GL_VENDOR)); + const char *renderer = reinterpret_cast<const char *>(glGetString(GL_RENDERER)); + const char *version = reinterpret_cast<const char *>(glGetString(GL_VERSION)); - reportContextString("Vendor", m_dummyVendor, vendor); - reportContextString("Renderer", m_dummyRenderer, renderer); - reportContextString("Version", m_dummyVersion, version); + reportContextString("Vendor", m_dummyVendor, vendor); + reportContextString("Renderer", m_dummyRenderer, renderer); + reportContextString("Version", m_dummyVersion, version); - fprintf(stderr, "Context Version: %d.%d\n", m_contextMajorVersion, m_contextMinorVersion); - } + fprintf(stderr, "Context Version: %d.%d\n", m_contextMajorVersion, m_contextMinorVersion); #endif return GHOST_kSuccess; diff --git a/intern/mantaflow/CMakeLists.txt b/intern/mantaflow/CMakeLists.txt index b2a0ab30a0c..2d49f96a451 100644 --- a/intern/mantaflow/CMakeLists.txt +++ b/intern/mantaflow/CMakeLists.txt @@ -30,11 +30,6 @@ if(WITH_OPENVDB) add_definitions(-DOPENVDB_STATICLIB) endif() -if(WIN32) - add_definitions(-D_USE_MATH_DEFINES) -endif() - - set(INC extern intern/strings |