diff options
| author | darealshinji <djcj@gmx.de> | 2016-07-23 12:09:16 (GMT) |
|---|---|---|
| committer | darealshinji <djcj@gmx.de> | 2016-07-25 12:12:55 (GMT) |
| commit | d4b2eebc27b991fc7acf8a41fab2ddbf2e1a09e8 (patch) | |
| tree | d831ae4e129d69ddc5bf1014c4b93e08ce922943 /src/djvulibre-1-fixes.patch | |
| parent | 29050ec9aa4ad33ad7dd0bcaff5cf6799173109e (diff) | |
| download | mxe-d4b2eebc27b991fc7acf8a41fab2ddbf2e1a09e8.zip mxe-d4b2eebc27b991fc7acf8a41fab2ddbf2e1a09e8.tar.gz mxe-d4b2eebc27b991fc7acf8a41fab2ddbf2e1a09e8.tar.bz2 | |
djvulibre: fixes
Diffstat (limited to 'src/djvulibre-1-fixes.patch')
| -rw-r--r-- | src/djvulibre-1-fixes.patch | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/src/djvulibre-1-fixes.patch b/src/djvulibre-1-fixes.patch index e8f3004..d62bd8a 100644 --- a/src/djvulibre-1-fixes.patch +++ b/src/djvulibre-1-fixes.patch @@ -1,6 +1,19 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji <djcj@gmx.de> +Date: Sun, 24 Jul 2016 09:33:22 +0200 +Subject: [PATCH] define XXX_EXPORT symbols + + +diff --git a/libdjvu/Makefile.am b/libdjvu/Makefile.am +index 1111111..2222222 100644 --- a/libdjvu/Makefile.am +++ b/libdjvu/Makefile.am -@@ -33,6 +33,8 @@ +@@ -33,6 +33,8 @@ libdjvulibre_la_LIBADD = $(JPEG_LIBS) $(PTHREAD_LIBS) libdjvulibre_la_LDFLAGS = -no-undefined -version-info $(version_info) if HAVE_OS_WIN32 @@ -9,23 +22,30 @@ libdjvulibre_la_LDFLAGS += -Wl,--export-all-symbols endif + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji <djcj@gmx.de> +Date: Sun, 24 Jul 2016 09:36:49 +0200 +Subject: [PATCH] disable unknown pragma warnings + + +diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp +index 1111111..2222222 100644 --- a/libdjvu/miniexp.cpp +++ b/libdjvu/miniexp.cpp -@@ -383,14 +383,16 @@ +@@ -382,6 +382,7 @@ static void NTAPI gctls_cb(PVOID, DWORD dwReason, PVOID) { + {CSLOCK(r);TlsFree(tlsIndex);tlsIndex=TLS_OUT_OF_INDEXES;} } # endif ++#ifndef __GNUC__ // -- Very black magic to clean tls variables. -+/* # ifdef _M_IX86 # pragma comment (linker, "/INCLUDE:_tlscb") - # else - # pragma comment (linker, "/INCLUDE:tlscb") - # endif +@@ -391,6 +392,7 @@ static void NTAPI gctls_cb(PVOID, DWORD dwReason, PVOID) { # pragma const_seg(".CRT$XLB") -+*/ extern "C" PIMAGE_TLS_CALLBACK tlscb = gctls_cb; --# pragma const_seg() -+/* # pragma const_seg() */ + # pragma const_seg() ++#endif /* !__GNUC__ */ #else // No threads |