Mercurial > mxe-octave

annotate src/msvc-gnuplot-1.patch @ 7207:9ed6500e56d3 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 17 May 2024 20:16:41 +0200
parents 0e869df2f0ff
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3115
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur gnuplot-4.6.1-orig/config/config.nt gnuplot-4.6.1/config/config.nt
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- gnuplot-4.6.1-orig/config/config.nt 2011-12-28 17:00:37 -0500
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ gnuplot-4.6.1/config/config.nt 2013-07-02 10:46:26 -0400
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -76,7 +76,7 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 /* #undef HAVE_DECL_SIGNGAM */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 /* Define to 1 if you have the <dirent.h> header file. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 -/* #undef HAVE_DIRENT_H */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 +#define HAVE_DIRENT_H 1
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 /* Define to 1 if you have the `doprnt' function. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 /* #undef HAVE_DOPRNT */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 @@ -138,14 +138,14 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 /* #undef HAVE_GTK28 */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 /* define if you have libiconv and iconv.h */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 -/* #undef HAVE_ICONV */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 +#define HAVE_ICONV 1
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 /* Don't change it here -- this define is set in config/msvc/Makefile. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 /* Define to 1 if you have the `index' function. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 /* #undef HAVE_INDEX */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 /* Define to 1 if you have the <inttypes.h> header file. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 -/* #undef HAVE_INTTYPES_H */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 +#define HAVE_INTTYPES_H 1
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 /* Define if you use have kpsexpand (TeX). */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 /* #undef HAVE_KPSEXPAND */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 @@ -183,7 +183,7 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 /* #undef HAVE_LIBREADLINE */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 /* Define if you have zlib. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 -/* #undef HAVE_LIBZ */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 +#define HAVE_LIBZ 1
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 /* Don't change it here -- this define is set in config/msvc/Makefile. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 /* Define to 1 if you have the <limits.h> header file. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 @@ -278,7 +278,7 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 /* #undef HAVE_STDBOOL_H */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 /* Define to 1 if you have the <stdint.h> header file. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 -/* #undef HAVE_STDINT_H */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 +#define HAVE_STDINT_H 1
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 /* Define to 1 if you have the <stdlib.h> header file. */
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 #define HAVE_STDLIB_H 1
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 @@ -592,7 +592,7 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 #define GP_MATHERR _matherr
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 #define snprintf _snprintf
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 /*#define vsnprintf _vsnprintf*/
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 -#define isnan _isnan
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 +/*#define isnan _isnan*/
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 #define ftruncate _chsize
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 #ifdef PIPES
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 diff -ur gnuplot-4.6.1-orig/config/msvc/Makefile gnuplot-4.6.1/config/msvc/Makefile
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 --- gnuplot-4.6.1-orig/config/msvc/Makefile 2012-09-17 02:07:32 -0400
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 +++ gnuplot-4.6.1/config/msvc/Makefile 2013-07-02 10:46:35 -0400
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 @@ -41,7 +41,7 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 # Compilation options, disable by setting to zero
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 # Is libgd available? (required by terminal png/jpeg/gif)?
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 -GDLIB = 1
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 +GDLIB = 0
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 # Is pdflib available? (required by terminal pdf)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 PDFLIB = 0
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 # Build wxt terminal? (required GTK, wxWidgets, cairo and pango libraries)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 @@ -49,7 +49,7 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 # http://wiki.wxwidgets.org/Visual_Studio_2008_%289.0%29
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 WXT = 0
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 # Build the lua/tikz terminal?
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 -LUA = 1
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 +LUA = 0
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 # Choose help format:
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 # for HTML help (.chm) this should be 1, for (.hlp) it should be 0
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 HTML_HELP = 1
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 @@ -65,16 +65,16 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 TOP = ..\\..
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 # directory for PostScript prolog and associated files
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 -GNUPLOT_PS_DIR = share\\PostScript
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83 +GNUPLOT_PS_DIR = share\\gnuplot\\PostScript
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 # Similarly for javascript files for the canvas terminal:
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 -GNUPLOT_JS_DIR = share\\js
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 +GNUPLOT_JS_DIR = share\\gnuplot\\js
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 # Similarly for scripts used by the lua terminal
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 -GNUPLOT_LUA_DIR = share\\lua
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 +GNUPLOT_LUA_DIR = share\\gnuplot\\lua
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 # gnuplot will look for gnuplotrc here:
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 -GNUPLOT_SHARE_DIR = share
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 +GNUPLOT_SHARE_DIR = share\\gnuplot
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 #CC = cl
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 LD = link
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 @@ -86,7 +86,7 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100 # /O2 mans optimize for speed
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 # /Zi means prepare for codeview
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 # /MD means include multi-thread support (DLL)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103 -CBASEFLAGS = /EHsc /GR /MD /O2 /nologo
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
104 +CBASEFLAGS = /EHsc /GR /MD /O2 /nologo /I$(DESTDIR:\=\\)\\include
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 CFLAGS = $(CBASEFLAGS) /I. /I$(TOP) /I$(S) /D_Windows /DWIN32 /DHAVE_CONFIG_H /D__MSC__ /DHELPFILE=\"$(HELPFILE)\" $(OPTIONS)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106 CFLAGS = $(CFLAGS) /DGNUPLOT_SHARE_DIR=\"$(GNUPLOT_SHARE_DIR)\"
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 CONSOLE_CFLAGS = /DWGP_CONSOLE /DCONSOLE_SWITCH_CP /DPIPES
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 @@ -198,6 +198,7 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110 wgnuplot.exe: $(OBJS) $(WINOBJS) wgnuplot.res linkopt-w.msw texticon.ico grpicon.ico
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 $(LD) /subsystem:windows $(LDFLAGS) /map:wgnuplot.map /out:$@ @linkopt-w.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112 + mt -outputresource:$@;1 -manifest $@.manifest
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
113 !IF "$(GDLIB)" == "1"
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
114 copy $(GDDIR)\bin\*.dll .
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
115 !ENDIF
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
116 @@ -207,6 +208,7 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
117
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
118 gnuplot.exe: $(ALL_CONSOLE_OBJS) wgnuplot.res linkopt-c.msw texticon.ico grpicon.ico
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
119 $(LD) /subsystem:console $(LDFLAGS) /map:wgnuplot.map /out:$@ @linkopt-c.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
120 + mt -outputresource:$@;1 -manifest $@.manifest
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
121 !IF "$(GDLIB)" == "1"
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
122 copy $(GDDIR)\bin\*.dll .
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
123 !ENDIF
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
124 @@ -237,6 +239,10 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
125 !IF "$(LUA)" == "1"
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
126 echo $(LUALIBS) >> linkopt-w.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
127 !ENDIF
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
128 + echo /LIBPATH:$(DESTDIR:\=\\)\\lib >> linkopt-w.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
129 + echo dirent.lib >> linkopt-w.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
130 + echo msvcmath.lib >> linkopt-w.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
131 + echo iconv.lib >> linkopt-w.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
132
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
133 linkopt-c.msw: Makefile
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
134 echo $(ALL_CONSOLE_OBJS) > linkopt-c.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
135 @@ -258,6 +264,10 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
136 !IF "$(LUA)" == "1"
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
137 echo $(LUALIBS) >> linkopt-c.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
138 !ENDIF
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
139 + echo /LIBPATH:$(DESTDIR:\=\\)\\lib >> linkopt-c.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
140 + echo dirent.lib >> linkopt-c.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
141 + echo msvcmath.lib >> linkopt-c.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
142 + echo iconv.lib >> linkopt-c.msw
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
143
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
144 # rules
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
145
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
146 @@ -361,13 +371,11 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
147 copy /Y wgnuplot.exe $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
148 copy /Y pgnuplot.exe $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
149 copy /Y gnuplot.exe $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
150 - copy /Y *gnuplot.exe.manifest $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
151 copy /Y $(W)wgnuplot.mnu $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
152 copy /Y $(W)wgnuplot-ja.mnu $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
153 if exist wgnuplot.chm copy /Y wgnuplot.chm $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
154 if exist wgnuplot-ja.chm copy /Y wgnuplot-ja.chm $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
155 if exist wgnuplot.hlp copy /Y wgnuplot.hlp $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
156 - copy /Y *.dll $(DESTDIR)\bin
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
157 if not exist $(DESTDIR)\$(GNUPLOT_PS_DIR) mkdir $(DESTDIR)\$(GNUPLOT_PS_DIR)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
158 xcopy /Y $(T)PostScript\*.ps $(DESTDIR)\$(GNUPLOT_PS_DIR)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
159 if not exist $(DESTDIR)\$(GNUPLOT_JS_DIR) mkdir $(DESTDIR)\$(GNUPLOT_JS_DIR)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
160 @@ -380,13 +388,13 @@
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
161 if not exist $(DESTDIR)\share\LaTeX mkdir $(DESTDIR)\share\LaTeX
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
162 copy /Y $(TOP)\share\LaTeX\README $(DESTDIR)\share\LaTeX
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
163 copy /Y $(TOP)\share\LaTeX\gnuplot.cfg $(DESTDIR)\share\LaTeX
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
164 - for %f in (BUGS README Copyright NEWS ChangeLog) do copy $(TOP)\%f $(DESTDIR)\%f
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
165 - if exist $(TOP)\win\README.Windows copy /Y $(TOP)\win\README.Windows $(DESTDIR)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
166 - copy /Y $(TOP)\src\win\README.win-ja $(DESTDIR)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
167 - if not exist $(DESTDIR)\demo mkdir $(DESTDIR)\demo
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
168 - xcopy /Y $(TOP)\demo $(DESTDIR)\demo
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
169 - if not exist $(DESTDIR)\contrib\pm3d mkdir $(DESTDIR)\contrib\pm3d
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
170 - xcopy /Y $(TOP)\pm3d\contrib\*.* $(DESTDIR)\contrib\pm3d
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
171 + for %f in (BUGS README Copyright NEWS ChangeLog) do copy $(TOP)\%f $(DESTDIR)\$(GNUPLOT_SHARE_DIR)\%f
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
172 + if exist $(TOP)\win\README.Windows copy /Y $(TOP)\win\README.Windows $(DESTDIR)\$(GNUPLOT_SHARE_DIR)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
173 + copy /Y $(TOP)\src\win\README.win-ja $(DESTDIR)\$(GNUPLOT_SHARE_DIR)
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
174 + if not exist $(DESTDIR)\$(GNUPLOT_SHARE_DIR)\demo mkdir $(DESTDIR)\$(GNUPLOT_SHARE_DIR)\demo
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
175 + xcopy /Y $(TOP)\demo $(DESTDIR)\$(GNUPLOT_SHARE_DIR)\demo
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
176 + if not exist $(DESTDIR)\$(GNUPLOT_SHARE_DIR)\contrib\pm3d mkdir $(DESTDIR)\$(GNUPLOT_SHARE_DIR)\contrib\pm3d
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
177 + xcopy /Y $(TOP)\pm3d\contrib\*.* $(DESTDIR)\$(GNUPLOT_SHARE_DIR)\contrib\pm3d
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
178
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
179 zip:
0e869df2f0ff [MSVC] enable gnuplot compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
180 $(MAKE) DESTDIR=.\gnuplot install