wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 884222 - Use __declspec(dllexport) in Opus on mingw. r=derf

Browse Source
This commit is contained in:
Jacek Caban 2013-06-19 16:14:05 +02:00
parent 8a348c090d
commit f67f3ba0b3
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/libopus/include/opus_defines.h
View File

@ -72,14 +72,14 @@ extern "C" {
/** @cond OPUS_INTERNAL_DOC */
/**Export control for opus functions */
#if defined(__GNUC__) && defined(OPUS_BUILD)
# define OPUS_EXPORT __attribute__ ((visibility ("default")))
#elif defined(WIN32)
#if defined(WIN32)
# ifdef OPUS_BUILD
# define OPUS_EXPORT __declspec(dllexport)
# else
# define OPUS_EXPORT __declspec(dllimport)
# endif
#elif defined(__GNUC__) && defined(OPUS_BUILD)
# define OPUS_EXPORT __attribute__ ((visibility ("default")))
#else
# define OPUS_EXPORT
#endif

28
media/libopus/mingw.patch Normal file
View File

@ -0,0 +1,28 @@
commit 986fb3ec557aa7aeb8788360224708ffa2955072
Author: Jacek Caban <jacek@codeweavers.com>
Date: Wed Jun 12 17:30:47 2013 +0200
Use __declspec(dllexport) on mingw build.
diff --git a/media/libopus/include/opus_defines.h b/media/libopus/include/opus_defines.h
index db6b3b7..b64049b 100644
--- a/media/libopus/include/opus_defines.h
+++ b/media/libopus/include/opus_defines.h
@@ -72,14 +72,14 @@ extern "C" {
/** @cond OPUS_INTERNAL_DOC */
/**Export control for opus functions */
-#if defined(__GNUC__) && defined(OPUS_BUILD)
-# define OPUS_EXPORT __attribute__ ((visibility ("default")))
-#elif defined(WIN32)
+#if defined(WIN32)
# ifdef OPUS_BUILD
# define OPUS_EXPORT __declspec(dllexport)
# else
# define OPUS_EXPORT __declspec(dllimport)
# endif
+#elif defined(__GNUC__) && defined(OPUS_BUILD)
+# define OPUS_EXPORT __attribute__ ((visibility ("default")))
#else
# define OPUS_EXPORT
#endif

1
media/libopus/update.sh
View File

@ -65,3 +65,4 @@ sed -e "s/^The git tag\/revision used was .*/The git tag\/revision used was ${ve
# apply outstanding local patches
patch -p3 < bug776661.patch
patch -p1 < padding.patch
patch -p3 < mingw.patch