Mercurial > mxe-octave

annotate src/msvc-netcdf-1.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents 591b3d68b43e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3157
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur netcdf-4.3.0-orig/Makefile.am netcdf-4.3.0-new/Makefile.am
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- netcdf-4.3.0-orig/Makefile.am 2013-05-09 12:15:22 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ netcdf-4.3.0-new/Makefile.am 2013-07-20 15:18:07 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -139,7 +139,9 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 install-data-hook:
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 if BUILD_DLL
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 - cp liblib/netcdfdll.def ${prefix}/lib
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 + if test -f liblib/netcdfdll.def; then \
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 + cp liblib/netcdfdll.def ${prefix}/lib; \
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 + fi
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 endif # BUILD_DLL
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 @echo ''
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 @echo '+-------------------------------------------------------------+'
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 diff -ur netcdf-4.3.0-orig/configure.ac netcdf-4.3.0-new/configure.ac
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 --- netcdf-4.3.0-orig/configure.ac 2013-05-09 12:15:14 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 +++ netcdf-4.3.0-new/configure.ac 2013-07-20 13:38:00 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 @@ -652,9 +652,9 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 opendap with --disable-netcdf-4 --disable-dap, or see config.log for errors.])])
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 fi
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 -# We need the math library
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 -AC_CHECK_LIB([m], [floor], [],
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 -[AC_MSG_ERROR([Can't find or link to the math library.])])
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 +## We need the math library
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 +#AC_CHECK_LIB([m], [floor], [],
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 +#[AC_MSG_ERROR([Can't find or link to the math library.])])
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 if test "x$enable_netcdf_4" = xyes; then
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 diff -ur netcdf-4.3.0-orig/lib_flags.am netcdf-4.3.0-new/lib_flags.am
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 --- netcdf-4.3.0-orig/lib_flags.am 2013-05-09 12:15:24 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 +++ netcdf-4.3.0-new/lib_flags.am 2013-07-20 13:38:47 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 @@ -15,7 +15,7 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 # This turns on declspec magic in netcdf.h for windows DLLs.
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 if BUILD_DLL
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 -AM_CPPFLAGS += -DDLL_NETCDF
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 +AM_CPPFLAGS += -DDLL_NETCDF -D_HDF5USEDLL_
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 diff -ur netcdf-4.3.0-orig/libdap2/dcelex.c netcdf-4.3.0-new/libdap2/dcelex.c
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 --- netcdf-4.3.0-orig/libdap2/dcelex.c 2013-05-09 12:15:24 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 +++ netcdf-4.3.0-new/libdap2/dcelex.c 2013-07-20 14:25:14 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 @@ -14,6 +14,10 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 #include "dceconstraints.h"
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 #include "dceparselex.h"
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 +#ifdef _MSC_VER
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 +#define strtoll _strtoi64
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 +#endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 +
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 /* Forward */
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 static void dumptoken(DCElexstate* lexstate);
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 static int tohex(int c);
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 diff -ur netcdf-4.3.0-orig/libdap2/dceparse.c netcdf-4.3.0-new/libdap2/dceparse.c
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 --- netcdf-4.3.0-orig/libdap2/dceparse.c 2013-05-09 12:15:24 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 +++ netcdf-4.3.0-new/libdap2/dceparse.c 2013-07-20 14:25:35 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 @@ -20,6 +20,10 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 #include "dceconstraints.h"
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 #include "dceparselex.h"
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 +#ifdef _MSC_VER
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 +#define strtoll _strtoi64
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 +#endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 +
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 static Object collectlist(Object list0, Object decl);
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 void
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 diff -ur netcdf-4.3.0-orig/ncdump/Makefile.am netcdf-4.3.0-new/ncdump/Makefile.am
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 --- netcdf-4.3.0-orig/ncdump/Makefile.am 2013-05-09 12:15:21 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 +++ netcdf-4.3.0-new/ncdump/Makefile.am 2013-07-20 15:04:56 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 @@ -6,7 +6,7 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 # Put together AM_CPPFLAGS and AM_LDFLAGS.
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 include $(top_srcdir)/lib_flags.am
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 -LDADD = ${top_builddir}/liblib/libnetcdf.la
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 +LDADD = ${top_builddir}/liblib/libnetcdf.la -lgetopt
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 TESTS_ENVIRONMENT=CC=${CC}
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83 diff -ur netcdf-4.3.0-orig/ncdump/nccopy.c netcdf-4.3.0-new/ncdump/nccopy.c
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 --- netcdf-4.3.0-orig/ncdump/nccopy.c 2013-05-09 12:15:21 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 +++ netcdf-4.3.0-new/ncdump/nccopy.c 2013-07-20 15:06:36 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 @@ -23,11 +23,13 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 #include "nccomps.h"
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 #ifdef _MSC_VER
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 +#ifndef HAVE_GETOPT_H
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 #include "XGetopt.h"
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 -#define snprintf _snprintf
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 int opterr;
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 int optind;
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 #endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 +#define snprintf _snprintf
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 +#endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 /* default bytes of memory we are willing to allocate for variable
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100 * values during copy */
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 diff -ur netcdf-4.3.0-orig/ncdump/ncdump.c netcdf-4.3.0-new/ncdump/ncdump.c
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 --- netcdf-4.3.0-orig/ncdump/ncdump.c 2013-05-09 12:15:21 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103 +++ netcdf-4.3.0-new/ncdump/ncdump.c 2013-07-20 15:04:28 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
104 @@ -13,11 +13,13 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 #endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 #ifdef _MSC_VER
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 -#define snprintf _snprintf
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109 +#ifndef HAVE_GETOPT_H
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110 #include "XGetopt.h"
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 int opterr;
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112 int optind;
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
113 #endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
114 +#define snprintf _snprintf
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
115 +#endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
116
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
117 #include <stdlib.h>
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
118 #include <string.h>
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
119 diff -ur netcdf-4.3.0-orig/ncgen/Makefile.am netcdf-4.3.0-new/ncgen/Makefile.am
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
120 --- netcdf-4.3.0-orig/ncgen/Makefile.am 2013-05-09 12:15:07 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
121 +++ netcdf-4.3.0-new/ncgen/Makefile.am 2013-07-20 15:01:43 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
122 @@ -4,7 +4,7 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
123
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
124 # Put together AM_CPPFLAGS and AM_LDFLAGS.
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
125 include $(top_srcdir)/lib_flags.am
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
126 -LDADD = ${top_builddir}/liblib/libnetcdf.la
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
127 +LDADD = ${top_builddir}/liblib/libnetcdf.la -lgetopt
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
128
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
129 # Build ncgen from the listed sources.
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
130 bin_PROGRAMS = ncgen
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
131 diff -ur netcdf-4.3.0-orig/ncgen/main.c netcdf-4.3.0-new/ncgen/main.c
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
132 --- netcdf-4.3.0-orig/ncgen/main.c 2013-05-09 12:15:07 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
133 +++ netcdf-4.3.0-new/ncgen/main.c 2013-07-20 15:02:12 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
134 @@ -12,11 +12,13 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
135 #endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
136
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
137 #ifdef _MSC_VER
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
138 +#ifndef HAVE_GETOPT_H
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
139 #include "XGetopt.h"
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
140 -#define snprintf _snprintf
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
141 int opterr;
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
142 int optind;
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
143 #endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
144 +#define snprintf _snprintf
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
145 +#endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
146
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
147 /* Default is netcdf-3 mode 1 */
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
148 #define DFALTCMODE 0
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
149 diff -ur netcdf-4.3.0-orig/ncgen3/Makefile.am netcdf-4.3.0-new/ncgen3/Makefile.am
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
150 --- netcdf-4.3.0-orig/ncgen3/Makefile.am 2013-05-09 12:15:15 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
151 +++ netcdf-4.3.0-new/ncgen3/Makefile.am 2013-07-20 15:00:09 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
152 @@ -6,7 +6,7 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
153 include $(top_srcdir)/lib_flags.am
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
154
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
155 # Link to the netCDF library.
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
156 -ncgen3_LDADD = ${top_builddir}/liblib/libnetcdf.la
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
157 +ncgen3_LDADD = ${top_builddir}/liblib/libnetcdf.la -lgetopt
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
158
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
159 # Build ncgen from the listed sources.
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
160 bin_PROGRAMS = ncgen3
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
161 diff -ur netcdf-4.3.0-orig/ncgen3/main.c netcdf-4.3.0-new/ncgen3/main.c
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
162 --- netcdf-4.3.0-orig/ncgen3/main.c 2013-05-09 12:15:15 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
163 +++ netcdf-4.3.0-new/ncgen3/main.c 2013-07-20 14:59:25 -0400
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
164 @@ -15,11 +15,13 @@
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
165 #endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
166
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
167 #ifdef _MSC_VER
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
168 +#ifndef HAVE_GETOPT_H
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
169 #include "XGetopt.h"
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
170 -#define snprintf _snprintf
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
171 int opterr;
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
172 int optind;
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
173 #endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
174 +#define snprintf _snprintf
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
175 +#endif
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
176
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
177 #ifdef __hpux
591b3d68b43e Add netcdf module (and MSVC-specific patch)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
178 #include <locale.h>