Mercurial > mxe-octave
view src/msvc-tiff-1.patch @ 4472:0fdeee4cfe11
gnuplot: enable Qt terminal and set default to wxt
* src/gnuplot.mk: Depend on qt5 and build with QT=1 QT_DIR=$(HOST_PREFIX)/qt QT_BIN_DIR=(BUILD_TOOLS_PREFIX)/bin,
install gnuplot_qt.exe
* src/gnuplot-1-fixes.patch: add to patchto allow override of QT tools and paths
* installer-files/octave-firsttime.vbs: set GNUTERM=wxt
* installer-files/octave.vbs: set GNUTERM=wxt
* installer-files/octave.bat: set GNUTERM=wxt
* installer-files/cmdshell.bat: set GNUTERM=wxt
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Wed, 06 Sep 2017 16:19:37 -0700 |
parents | 14afb4dd1939 |
children |
line wrap: on
line source
diff -ur tiff-4.0.3-orig/libtiff/Makefile.in tiff-4.0.3/libtiff/Makefile.in --- tiff-4.0.3-orig/libtiff/Makefile.in 2012-09-22 12:08:19 -0400 +++ tiff-4.0.3/libtiff/Makefile.in 2013-06-26 22:40:20 -0400 @@ -423,10 +423,12 @@ lib_LTLIBRARIES = libtiff.la $(am__append_6) libtiff_la_LDFLAGS = -no-undefined -version-info \ - $(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8) + $(LIBTIFF_VERSION_INFO) $(am__append_7) $(am__append_8) \ + -export-symbols-regex "xXx" -Wl,libtiff.def libtiff_la_LIBADD = $(LIBPORT) libtiffxx_la_LDFLAGS = -no-undefined -version-info \ - $(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10) + $(LIBTIFF_VERSION_INFO) $(am__append_9) $(am__append_10) \ + -export-symbols-regex "xXx" libtiffxx_la_LIBADD = $(LIBTIFF) $(LIBPORT) libtiffxx_la_DEPENDENCIES = libtiff.la mkg3states_SOURCES = mkg3states.c tif_fax3.h diff -ur tiff-4.0.3-orig/libtiff/tif_stream.cxx tiff-4.0.3/libtiff/tif_stream.cxx --- tiff-4.0.3-orig/libtiff/tif_stream.cxx 2010-12-13 20:45:44 -0500 +++ tiff-4.0.3/libtiff/tif_stream.cxx 2013-06-26 22:31:55 -0400 @@ -392,6 +392,9 @@ } /* extern "C" */ +#ifdef _MSC_VER +__declspec(dllexport) +#endif TIFF* TIFFStreamOpen(const char* name, ostream *os) { @@ -408,6 +411,9 @@ return _tiffStreamOpen(name, "wm", os); } +#ifdef _MSC_VER +__declspec(dllexport) +#endif TIFF* TIFFStreamOpen(const char* name, istream *is) { diff -ur tiff-4.0.3-orig/libtiff/tiffiop.h tiff-4.0.3/libtiff/tiffiop.h --- tiff-4.0.3-orig/libtiff/tiffiop.h 2012-06-06 09:35:23 -0400 +++ tiff-4.0.3/libtiff/tiffiop.h 2013-06-26 22:35:20 -0400 @@ -72,6 +72,10 @@ #define FALSE 0 #endif +#if defined(_MSC_VER) && !defined(snprintf) +#define snprintf _snprintf +#endif + typedef struct client_info { struct client_info *next; void *data;