Mercurial > mxe-octave

changeset 3097:ee6f302d0659

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable QHull compilation
author Michael Goffioul <michael.goffioul@gmail.com>
date Tue, 25 Jun 2013 20:51:02 -0400
parents 3b9908a79b71
children 4c72697bcbc4
files src/msvc-qhull-1.patch src/qhull.mk
diffstat 2 files changed, 49 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/msvc-qhull-1.patch	Tue Jun 25 20:51:02 2013 -0400
@@ -0,0 +1,48 @@
+diff -ur qhull-2009.1-orig/src/Makefile.am qhull-2009.1/src/Makefile.am
+--- qhull-2009.1-orig/src/Makefile.am	2013-06-25 20:40:09 -0400
++++ qhull-2009.1/src/Makefile.am	2013-06-25 20:44:01 -0400
+@@ -23,6 +23,7 @@
+   mem.c
+ 
+ # how:
++libqhull_la_CPPFLAGS = -DBUILDING_QHULL
+ libqhull_la_LDFLAGS = -no-undefined -version-info 5:0:0 -lm
+ 
+ ### Utility programs
+diff -ur qhull-2009.1-orig/src/qhull.h qhull-2009.1/src/qhull.h
+--- qhull-2009.1-orig/src/qhull.h	2004-01-30 17:38:32 -0500
++++ qhull-2009.1/src/qhull.h	2013-06-25 20:42:03 -0400
+@@ -51,9 +51,19 @@
+ 
+ #include "user.h"      /* user defineable constants */
+ 
++#ifdef _MSC_VER
++# ifdef BUILDING_QHULL
++#  define QHULL_EXTERN extern __declspec(dllexport)
++# else
++#  define QHULL_EXTERN extern __declspec(dllimport)
++# endif
++#else
++# define QHULL_EXTERN extern
++#endif
++
+ /*============ constants and basic types ====================*/
+ 
+-extern char *qh_version; /* defined in global.c */
++QHULL_EXTERN char *qh_version; /* defined in global.c */
+ 
+ /*-<a                             href="qh-geom.htm#TOC"
+   >--------------------------------</a><a name="coordT">-</a>
+@@ -376,10 +386,10 @@
+ typedef struct qhT qhT;
+ #if qh_QHpointer
+ #define qh qh_qh->
+-extern qhT *qh_qh;     /* allocated in global.c */
++QHULL_EXTERN qhT *qh_qh;     /* allocated in global.c */
+ #else
+ #define qh qh_qh.
+-extern qhT qh_qh;
++QHULL_EXTERN qhT qh_qh;
+ #endif
+ 
+ struct qhT {
--- a/src/qhull.mk	Tue Jun 25 20:16:00 2013 -0400
+++ b/src/qhull.mk	Tue Jun 25 20:51:02 2013 -0400
@@ -21,6 +21,6 @@
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(HOST_PREFIX)'
+        --prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
 endef