Mercurial > mxe-octave
annotate src/msvc-proj-1.patch @ 3908:5863c4ed08b1
of-dicom: patch to compile in octave 4.0.0 (Bug #44624)
* src/of-dicom-1-fixes.patch: new file
* dist-files.mk: add of-dicom-1-fixes.patch
* src/of-dicom.mk: allow cross compile
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Wed, 15 Apr 2015 21:52:37 -0400 |
parents | 43449ab99ea2 |
children |
rev | line source |
---|---|
3155
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1 diff -ur proj-4.8.0-orig/src/Makefile.am proj-4.8.0/src/Makefile.am |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
2 --- proj-4.8.0-orig/src/Makefile.am 2012-03-07 00:58:49 -0500 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
3 +++ proj-4.8.0/src/Makefile.am 2013-07-20 11:32:41 -0400 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
4 @@ -22,7 +22,8 @@ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
5 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
6 lib_LTLIBRARIES = libproj.la |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
7 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
8 -libproj_la_LDFLAGS = -no-undefined -version-info 7:0:7 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
9 +libproj_la_CPPFLAGS = -DBUILDING_PROJ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
10 +libproj_la_LDFLAGS = -no-undefined -version-info 7:0:7 -Wl,proj.def -export-symbols-regex "xXx" |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
11 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
12 libproj_la_SOURCES = \ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
13 projects.h pj_list.h \ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
14 diff -ur proj-4.8.0-orig/src/emess.h proj-4.8.0/src/emess.h |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
15 --- proj-4.8.0-orig/src/emess.h 2010-12-05 11:06:29 -0500 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
16 +++ proj-4.8.0/src/emess.h 2013-07-20 11:35:24 -0400 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
17 @@ -11,7 +11,7 @@ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
18 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
19 #ifdef EMESS_ROUTINE /* use type */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 /* for emess procedure */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 -struct EMESS emess_dat = { (char *)0, (char *)0, 0 }; |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 +PROJ_EXPORT struct EMESS emess_dat = { (char *)0, (char *)0, 0 }; |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 #ifdef sun /* Archaic SunOs 4.1.1, etc. */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 extern char *sys_errlist[]; |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 @@ -20,7 +20,7 @@ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 #else /* for for calling procedures */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 -extern struct EMESS emess_dat; |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 +extern PROJ_EXPORT struct EMESS emess_dat; |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 void emess(int, char *, ...); |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 #endif /* use type */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 diff -ur proj-4.8.0-orig/src/proj.def proj-4.8.0/src/proj.def |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 --- proj-4.8.0-orig/src/proj.def 2011-05-04 14:50:18 -0400 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
37 +++ proj-4.8.0/src/proj.def 2013-07-20 11:38:20 -0400 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
38 @@ -53,4 +53,8 @@ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
39 pj_ctx_set_app_data @51 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
40 pj_ctx_get_app_data @52 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 pj_log @53 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 - pj_clear_initcache @54 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 + pj_clear_initcache @54 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 + |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 + emess @55 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
46 + nad_init @56 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 + nad_cvt @57 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 diff -ur proj-4.8.0-orig/src/proj_api.h proj-4.8.0/src/proj_api.h |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
49 --- proj-4.8.0-orig/src/proj_api.h 2012-02-20 20:11:24 -0500 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
50 +++ proj-4.8.0/src/proj_api.h 2013-07-20 11:35:01 -0400 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
51 @@ -31,6 +31,16 @@ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 #ifndef PROJ_API_H |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 #define PROJ_API_H |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
54 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
55 +#ifdef _MSC_VER |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
56 +# ifdef BUILDING_PROJ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
57 +# define PROJ_EXPORT __declspec(dllexport) |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
58 +# else |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
59 +# define PROJ_EXPORT __declspec(dllimport) |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
60 +# endif |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
61 +#else |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
62 +# define PROJ_EXPORT |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
63 +#endif |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
64 + |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
65 /* standard inclusions */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
66 #include <math.h> |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
67 #include <stdlib.h> |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
68 @@ -42,13 +52,13 @@ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
69 /* Try to update this every version! */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
70 #define PJ_VERSION 480 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
71 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
72 -extern char const pj_release[]; /* global release id string */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
73 +extern PROJ_EXPORT char const pj_release[]; /* global release id string */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
74 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
75 #define RAD_TO_DEG 57.29577951308232 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
76 #define DEG_TO_RAD .0174532925199432958 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
77 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
78 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
79 -extern int pj_errno; /* global error return code */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
80 +extern PROJ_EXPORT int pj_errno; /* global error return code */ |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
81 |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
82 #if !defined(PROJECTS_H) |
43449ab99ea2
[MSVC] enable PROJ compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
83 typedef struct { double u, v; } projUV; |