Mercurial > mxe-octave

annotate src/mingw-s2tc-1-fixes.patch @ 4512:859c456e1257

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
s2tc: enable Windows build.
author John W. Eaton <jwe@octave.org>
date Wed, 18 Oct 2017 09:27:04 -0400
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4512
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/configure.ac b/configure.ac
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/configure.ac 2013-11-04 07:14:46.000000000 -0500
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/configure.ac 2017-10-18 09:14:22.139804537 -0400
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -11,7 +11,13 @@
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 fi
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 fi
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -AC_PROG_LIBTOOL
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 +ifdef([LT_INIT], [], [
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 + errprint([error: you must have libtool 2.2.2 or a more recent version
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 +])
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 + m4exit([1])])
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 +
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 +LT_PREREQ([2.2.2])
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 +LT_INIT([disable-static dlopen win32-dll])
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 AC_ARG_ENABLE(runtime-linking, AS_HELP_STRING([--disable-runtime-linking], [Do not load the library at runtime (faster startup, more dependencies)]), [enable_runtime_linking=$enableval], [enable_runtime_linking=yes])
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools], [Do not build the s2tc_compress and s2_decompress tools]), [enable_tools=$enableval], [enable_tools=yes])
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 diff -uNr a/Makefile.am b/Makefile.am
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 --- a/Makefile.am 2013-11-04 07:14:46.000000000 -0500
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 +++ b/Makefile.am 2017-10-18 09:15:08.413658528 -0400
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 @@ -26,7 +26,7 @@
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 if ENABLE_LIB
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 lib_LTLIBRARIES = libtxc_dxtn.la
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 libtxc_dxtn_la_SOURCES = s2tc_algorithm.cpp s2tc_libtxc_dxtn.cpp s2tc_common.h s2tc_algorithm.h txc_dxtn.h s2tc_license.h
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 -libtxc_dxtn_la_LDFLAGS = -versioninfo 0:0:0
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 +libtxc_dxtn_la_LDFLAGS = -versioninfo 0:0:0 -no-undefined
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 libtxc_dxtn_la_LIBADD = -lm
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 libtxc_dxtn_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
859c456e1257 s2tc: enable Windows build.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 library_includedir = $(includedir)