parent
4301cf2886
commit
acb344645b
@ -1,15 +0,0 @@
|
|||||||
# This file is part of MXE. See LICENSE.md for licensing information.
|
|
||||||
#Author: Julien Michel <julien.michel@orfeo-toolbox.org>
|
|
||||||
|
|
||||||
diff -bur openjpeg-2.0.1.orig/src/lib/openjp2/openjpeg.c openjpeg-2.0.1/src/lib/openjp2/openjpeg.c
|
|
||||||
--- openjpeg-2.0.1.orig/src/lib/openjp2/openjpeg.c 2014-10-15 10:56:09.435396565 +0530
|
|
||||||
+++ openjpeg-2.0.1/src/lib/openjp2/openjpeg.c 2014-10-15 10:57:18.038964950 +0530
|
|
||||||
@@ -132,7 +132,7 @@
|
|
||||||
#ifdef _WIN32
|
|
||||||
#ifndef OPJ_STATIC
|
|
||||||
BOOL APIENTRY
|
|
||||||
-DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
|
||||||
+DllMain(HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
|
|
||||||
|
|
||||||
OPJ_ARG_NOT_USED(lpReserved);
|
|
||||||
OPJ_ARG_NOT_USED(hModule);
|
|
@ -0,0 +1,25 @@
|
|||||||
|
This file is part of MXE. See LICENSE.md for licensing information.
|
||||||
|
|
||||||
|
From 2e44887c114a4c6fb92a65f5505c8cf4cc452b8c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Julien Michel <julien.michel@orfeo-toolbox.org>
|
||||||
|
Date: Sat, 26 Aug 2017 01:13:50 +0200
|
||||||
|
Subject: [PATCH] dllmacro
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h
|
||||||
|
index d571c516..d12f1c36 100644
|
||||||
|
--- a/src/lib/openjp2/openjpeg.h
|
||||||
|
+++ b/src/lib/openjp2/openjpeg.h
|
||||||
|
@@ -76,7 +76,8 @@ Most compilers implement their own version of this keyword ...
|
||||||
|
#define OPJ_DEPRECATED(func) func
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#if defined(OPJ_STATIC) || !defined(_WIN32)
|
||||||
|
+
|
||||||
|
+#if defined(OPJ_STATIC) || defined(__MINGW32__) || !defined(_WIN32)
|
||||||
|
/* http://gcc.gnu.org/wiki/Visibility */
|
||||||
|
# if __GNUC__ >= 4
|
||||||
|
# if defined(OPJ_STATIC) /* static library uses "hidden" */
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
@ -1,15 +0,0 @@
|
|||||||
# This file is part of MXE. See LICENSE.md for licensing information.
|
|
||||||
#Author: Julien Michel <julien.michel@orfeo-toolbox.org>
|
|
||||||
diff -bur openjpeg-2.0.1.orig/src/lib/openjp2/openjpeg.h openjpeg-2.0.1.diff/src/lib/openjp2/openjpeg.h
|
|
||||||
--- openjpeg-2.0.1.orig/src/lib/openjp2/openjpeg.h 2014-04-22 13:24:20.000000000 +0530
|
|
||||||
+++ openjpeg-2.0.1.diff/src/lib/openjp2/openjpeg.h 2014-10-07 04:12:01.325229155 +0530
|
|
||||||
@@ -76,7 +76,8 @@
|
|
||||||
#define OPJ_DEPRECATED(func) func
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#if defined(OPJ_STATIC) || !defined(_WIN32)
|
|
||||||
+
|
|
||||||
+#if defined(OPJ_STATIC) || defined(__MINGW32__) || !defined(_WIN32)
|
|
||||||
/* http://gcc.gnu.org/wiki/Visibility */
|
|
||||||
#if __GNUC__ >= 4
|
|
||||||
#define OPJ_API __attribute__ ((visibility ("default")))
|
|
Loading…
Reference in new issue