Mercurial > mxe-octave

comparison src/msvc-tiff-1.patch @ 3102:14afb4dd1939

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable TIFF compilation
author Michael Goffioul <michael.goffioul@gmail.com>
date Wed, 26 Jun 2013 22:56:56 -0400
parents
children
comparison
equal deleted inserted replaced
3101:c4d42deb35f9 3102:14afb4dd1939
1 diff -ur tiff-4.0.3-orig/libtiff/Makefile.in tiff-4.0.3/libtiff/Makefile.in
2 --- tiff-4.0.3-orig/libtiff/Makefile.in 2012-09-22 12:08:19 -0400
3 +++ tiff-4.0.3/libtiff/Makefile.in 2013-06-26 22:40:20 -0400
4 @@ -423,10 +423,12 @@
5
6 lib_LTLIBRARIES = libtiff.la $(am__append_6)
7 libtiff_la_LDFLAGS = -no-undefined -version-info \
8 - $(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8)
9 + $(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8) \
10 + -export-symbols-regex "xXx" -Wl,libtiff.def
11 libtiff_la_LIBADD = $(LIBPORT)
12 libtiffxx_la_LDFLAGS = -no-undefined -version-info \
13 - $(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10)
14 + $(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10) \
15 + -export-symbols-regex "xXx"
16 libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT)
17 libtiffxx_la_DEPENDENCIES = libtiff.la
18 mkg3states_SOURCES = mkg3states.c tif_fax3.h
19 diff -ur tiff-4.0.3-orig/libtiff/tif_stream.cxx tiff-4.0.3/libtiff/tif_stream.cxx
20 --- tiff-4.0.3-orig/libtiff/tif_stream.cxx 2010-12-13 20:45:44 -0500
21 +++ tiff-4.0.3/libtiff/tif_stream.cxx 2013-06-26 22:31:55 -0400
22 @@ -392,6 +392,9 @@
23
24 } /* extern "C" */
25
26 +#ifdef _MSC_VER
27 +__declspec(dllexport)
28 +#endif
29 TIFF*
30 TIFFStreamOpen(const char* name, ostream *os)
31 {
32 @@ -408,6 +411,9 @@
33 return _tiffStreamOpen(name, "wm", os);
34 }
35
36 +#ifdef _MSC_VER
37 +__declspec(dllexport)
38 +#endif
39 TIFF*
40 TIFFStreamOpen(const char* name, istream *is)
41 {
42 diff -ur tiff-4.0.3-orig/libtiff/tiffiop.h tiff-4.0.3/libtiff/tiffiop.h
43 --- tiff-4.0.3-orig/libtiff/tiffiop.h 2012-06-06 09:35:23 -0400
44 +++ tiff-4.0.3/libtiff/tiffiop.h 2013-06-26 22:35:20 -0400
45 @@ -72,6 +72,10 @@
46 #define FALSE 0
47 #endif
48
49 +#if defined(_MSC_VER) && !defined(snprintf)
50 +#define snprintf _snprintf
51 +#endif
52 +
53 typedef struct client_info {
54 struct client_info *next;
55 void *data;