瀏覽代碼

fixes for VS 2015

Former-commit-id: a314525f4ff8952f7107b0fc8c96cb251fe150ed
Daniele Panozzo 9 年之前
父節點
當前提交
0caf716d5b
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 2 2
      include/igl/parula.cpp
  2. 2 0
      python/CMakeLists.txt

+ 2 - 2
include/igl/parula.cpp

@@ -21,8 +21,8 @@ IGL_INLINE void igl::parula(const T f, T & r, T & g, T & b)
   const float eff_f = (f>=1.?1.:(f<=0.?0.:f));
   // continuous index into array
   const float ff = eff_f*(PARULA_COLOR_MAP.rows()-1);
-  size_t s = floor(ff);
-  size_t d = ceil(ff);
+  size_t s = std::floor(ff);
+  size_t d = std::ceil(ff);
   const float t = (s==d ? 0. : (ff-s)/float(d-s));
 
   assert(t>=0 && t<=1);

+ 2 - 0
python/CMakeLists.txt

@@ -6,6 +6,8 @@ IF(MSVC)
 ### Enable parallel compilation for Visual Studio
   add_definitions(-DEIGEN_DONT_ALIGN)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+  SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/../ )
+  SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/../ )
 ENDIF(MSVC)
 
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../tutorial/cmake)