Mercurial > mxe-octave
annotate src/msvc-qhull-1.patch @ 3726:1166dbbbe15c
build_packages.m: add helper function to install packages
* build_packages.m: add helper function to catch errors when installing packages.
author | John Donoghue |
---|---|
date | Tue, 28 Oct 2014 07:57:11 -0400 |
parents | ee6f302d0659 |
children |
rev | line source |
---|---|
3097
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1 diff -ur qhull-2009.1-orig/src/Makefile.am qhull-2009.1/src/Makefile.am |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
2 --- qhull-2009.1-orig/src/Makefile.am 2013-06-25 20:40:09 -0400 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
3 +++ qhull-2009.1/src/Makefile.am 2013-06-25 20:44:01 -0400 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
4 @@ -23,6 +23,7 @@ |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
5 mem.c |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
6 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
7 # how: |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
8 +libqhull_la_CPPFLAGS = -DBUILDING_QHULL |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
9 libqhull_la_LDFLAGS = -no-undefined -version-info 5:0:0 -lm |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
10 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
11 ### Utility programs |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
12 diff -ur qhull-2009.1-orig/src/qhull.h qhull-2009.1/src/qhull.h |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 --- qhull-2009.1-orig/src/qhull.h 2004-01-30 17:38:32 -0500 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 +++ qhull-2009.1/src/qhull.h 2013-06-25 20:42:03 -0400 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 @@ -51,9 +51,19 @@ |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 #include "user.h" /* user defineable constants */ |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 +#ifdef _MSC_VER |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 +# ifdef BUILDING_QHULL |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 +# define QHULL_EXTERN extern __declspec(dllexport) |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 +# else |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 +# define QHULL_EXTERN extern __declspec(dllimport) |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 +# endif |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 +#else |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 +# define QHULL_EXTERN extern |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 +#endif |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 + |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 /*============ constants and basic types ====================*/ |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 -extern char *qh_version; /* defined in global.c */ |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 +QHULL_EXTERN char *qh_version; /* defined in global.c */ |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 /*-<a href="qh-geom.htm#TOC" |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 >--------------------------------</a><a name="coordT">-</a> |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 @@ -376,10 +386,10 @@ |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 typedef struct qhT qhT; |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 #if qh_QHpointer |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 #define qh qh_qh-> |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 -extern qhT *qh_qh; /* allocated in global.c */ |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 +QHULL_EXTERN qhT *qh_qh; /* allocated in global.c */ |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 #else |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 #define qh qh_qh. |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 -extern qhT qh_qh; |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 +QHULL_EXTERN qhT qh_qh; |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 #endif |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 |
ee6f302d0659
[MSVC] enable QHull compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 struct qhT { |