Commit 9d98ad6a authored by Christophe Mutricy's avatar Christophe Mutricy

Fix win32 taglib linking

Don't use the export things in taglib as we don't need it and it's buggy
parent d3e0b1b2
......@@ -2310,12 +2310,15 @@ taglib-$(TAGLIB_VERSION).tar.gz:
taglib: taglib-$(TAGLIB_VERSION).tar.gz
$(EXTRACT_GZ)
ifdef HAVE_WIN32
patch -p0 < Patches/taglib.patch
endif
ifdef HAVE_CYGWIN
patch -p0 <Patches/taglib-cygwin.patch
patch -p0 < Patches/taglib-cygwin.patch
endif
.tag: taglib
(cd $<; $(HOSTCC) CXXFLAGS="-DMAKE_TAGLIB_LIB" ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
$(INSTALL_NAME)
touch $@
......
diff -ru taglib-1.5/taglib/taglib_export.h taglib/taglib/taglib_export.h
--- taglib-1.5/taglib/taglib_export.h 2008-02-04 15:14:46.000000000 +0000
+++ taglib/taglib/taglib_export.h 2008-04-13 18:25:29.000000000 +0100
@@ -28,9 +28,9 @@
#if defined(_WIN32) || defined(_WIN64)
#ifdef MAKE_TAGLIB_LIB
-#define TAGLIB_EXPORT __declspec(dllexport)
+#define TAGLIB_EXPORT
#else
-#define TAGLIB_EXPORT __declspec(dllimport)
+#define TAGLIB_EXPORT
#endif
#else
#define TAGLIB_EXPORT
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment