Page MenuHome
Files F23698

eltopo-fixes-11-24-2012.patch
Public
Actions

eltopo-fixes-11-24-2012.patch
View Options

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 52516)
+++ CMakeLists.txt (working copy)
@@ -991,7 +991,7 @@
set(LAPACK_LIBPATH ${LAPACK}/lib)
set(LAPACK_LIBRARIES
${LIBDIR}/lapack/lib/libf2c.lib
- ${LIBDIR}/lapack/lib/clapack_nowrap.lib
+ ${LIBDIR}/lapack/lib/clapackd_nowrap.lib
${LIBDIR}/lapack/lib/BLAS_nowrap.lib
)
endif()
Index: extern/eltopo/common/ccd_wrapper.cpp
===================================================================
--- extern/eltopo/common/ccd_wrapper.cpp (revision 52516)
+++ extern/eltopo/common/ccd_wrapper.cpp (working copy)
@@ -14,9 +14,10 @@
#include <tunicate.h>
#include <vec.h>
+
bool tunicate_verbose = false;
-#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#ifdef WIN32
#define random() rand() // not sure if this define is valid
#define _Ios_Fmtflags ios::fmtflags
#endif
Index: extern/eltopo/common/predicates.cpp
===================================================================
--- extern/eltopo/common/predicates.cpp (revision 52516)
+++ extern/eltopo/common/predicates.cpp (working copy)
@@ -1,7 +1,7 @@
#include <cfloat>
#include <predicates.h>
-#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#ifdef WIN32
#define random() rand() // not sure if this define is valid
#define _Ios_Fmtflags ios::fmtflags
#endif
Index: extern/eltopo/common/util.h
===================================================================
--- extern/eltopo/common/util.h (revision 52516)
+++ extern/eltopo/common/util.h (working copy)
@@ -195,7 +195,7 @@
inline T ramp(T r)
{ return smooth_step((r+1)/2)*2-1; }
-#ifdef WIN32
+#ifdef _MSC_VER
inline int lround(double x)
{
if(x>0)
Index: extern/eltopo/eltopo-capi.cpp
===================================================================
--- extern/eltopo/eltopo-capi.cpp (revision 52516)
+++ extern/eltopo/eltopo-capi.cpp (working copy)
@@ -1,3 +1,11 @@
+/* XXX:This seems like a very questionable way to implement a C++ memory arena.
+ Even though it isn't explicitely used, these definitions still override
+ the normal C++ operators, which could potentially result in unexpected behavior.
+ In addition it leads to linker errors in blenderplayer when building with MSVC 2008.
+ -- jwilkins */
+#if 0
+#include "eltopo-capi.h"
+
#include "common/vec.h"
#include "ccd_wrapper.h"
#include "cfloat"
@@ -33,3 +41,5 @@
arena = NULL;
}
}
+
+#endif

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
7b/a3/0ec27a0bf2d9e18855953bd69cb3

Event Timeline