Mercurial > mxe-octave
comparison src/mingw-s2tc-1-fixes.patch @ 4512:859c456e1257
s2tc: enable Windows build.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 18 Oct 2017 09:27:04 -0400 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
4511:0117b5797a5c | 4512:859c456e1257 |
---|---|
1 diff -uNr a/configure.ac b/configure.ac | |
2 --- a/configure.ac 2013-11-04 07:14:46.000000000 -0500 | |
3 +++ b/configure.ac 2017-10-18 09:14:22.139804537 -0400 | |
4 @@ -11,7 +11,13 @@ | |
5 fi | |
6 fi | |
7 | |
8 -AC_PROG_LIBTOOL | |
9 +ifdef([LT_INIT], [], [ | |
10 + errprint([error: you must have libtool 2.2.2 or a more recent version | |
11 +]) | |
12 + m4exit([1])]) | |
13 + | |
14 +LT_PREREQ([2.2.2]) | |
15 +LT_INIT([disable-static dlopen win32-dll]) | |
16 | |
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]) | |
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]) | |
19 diff -uNr a/Makefile.am b/Makefile.am | |
20 --- a/Makefile.am 2013-11-04 07:14:46.000000000 -0500 | |
21 +++ b/Makefile.am 2017-10-18 09:15:08.413658528 -0400 | |
22 @@ -26,7 +26,7 @@ | |
23 if ENABLE_LIB | |
24 lib_LTLIBRARIES = libtxc_dxtn.la | |
25 libtxc_dxtn_la_SOURCES = s2tc_algorithm.cpp s2tc_libtxc_dxtn.cpp s2tc_common.h s2tc_algorithm.h txc_dxtn.h s2tc_license.h | |
26 -libtxc_dxtn_la_LDFLAGS = -versioninfo 0:0:0 | |
27 +libtxc_dxtn_la_LDFLAGS = -versioninfo 0:0:0 -no-undefined | |
28 libtxc_dxtn_la_LIBADD = -lm | |
29 libtxc_dxtn_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement | |
30 library_includedir = $(includedir) |