diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager.cpp | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManagerCocoa.mm | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ebc20feaf9..c3c97a4c2c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -981,17 +981,17 @@ elseif(WIN32) set(CMAKE_C_FLAGS "/nologo /J /Gd /MP" CACHE STRING "MSVC MT C++ flags " FORCE) if(CMAKE_CL_64) - set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /Zi /MP" CACHE STRING "MSVC MT flags " FORCE) + set(CMAKE_CXX_FLAGS_DEBUG "/Od /RTC1 /MTd /Zi /MP" CACHE STRING "MSVC MT flags " FORCE) else() - set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /ZI /MP" CACHE STRING "MSVC MT flags " FORCE) + set(CMAKE_CXX_FLAGS_DEBUG "/Od /RTC1 /MTd /ZI /MP" CACHE STRING "MSVC MT flags " FORCE) endif() set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /MT /MP" CACHE STRING "MSVC MT flags " FORCE) set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /MT /MP" CACHE STRING "MSVC MT flags " FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi /MP" CACHE STRING "MSVC MT flags " FORCE) if(CMAKE_CL_64) - set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /Zi /MP" CACHE STRING "MSVC MT flags " FORCE) + set(CMAKE_C_FLAGS_DEBUG "/Od /RTC1 /MTd /Zi /MP" CACHE STRING "MSVC MT flags " FORCE) else() - set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /ZI /MP" CACHE STRING "MSVC MT flags " FORCE) + set(CMAKE_C_FLAGS_DEBUG "/Od /RTC1 /MTd /ZI /MP" CACHE STRING "MSVC MT flags " FORCE) endif() set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT /MP" CACHE STRING "MSVC MT flags " FORCE) set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /MT /MP" CACHE STRING "MSVC MT flags " FORCE) diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp index f8c707b668c..52ee574c4b5 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.cpp +++ b/intern/ghost/intern/GHOST_NDOFManager.cpp @@ -506,7 +506,5 @@ bool GHOST_NDOFManager::sendMotionEvent() m_system.pushEvent(event); - m_prevMotionTime = m_motionTime; - return true; } diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm index 4fc4f8016e5..0d620afd758 100644 --- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm @@ -162,7 +162,7 @@ GHOST_NDOFManagerCocoa::~GHOST_NDOFManagerCocoa() if (GHOST_NDOFManager3Dconnexion_available()) { GHOST_NDOFManager3Dconnexion_UnregisterConnexionClient(m_clientID); - GHOST_NDOFManager3Dconnexion_UnregisterConnexionClient(m_clientID); + GHOST_NDOFManager3Dconnexion_UnregisterConnexionClient(m_clientID); GHOST_NDOFManager3Dconnexion_CleanupConnexionHandlers(); ghost_system = NULL; diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 883f01d4eb6..9c77ba921e0 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -240,7 +240,7 @@ MINLINE unsigned short highest_order_bit_s(unsigned short n); MINLINE float shell_angle_to_dist(const float angle); -#if (defined(WIN32) || defined(WIN64)) && !defined(FREE_WINDOWS) +#if defined(MSC_VER) && (MSC_VER < 1800) extern double copysign(double x, double y); extern double round(double x); #endif diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 4baca862682..ce55a452d3e 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -2143,7 +2143,7 @@ void RNA_def_property_update(PropertyRNA *prop, int noteflag, const char *func) void RNA_def_property_update_runtime(PropertyRNA *prop, const void *func) { - prop->update = func; + prop->update = (void *)func; } void RNA_def_property_dynamic_array_funcs(PropertyRNA *prop, const char *getlength) |