Skip to content

V
vlc-2-2
Commit 5ae2d471 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Contribs: fix libcaca-beta17 linkage on Win32

parent 3df4c74c
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 0 deletions
extras/contrib/src/Makefile
View file @ 5ae2d471
......@@ -1323,6 +1323,10 @@ ifdef HAVE_DARWIN_OS
patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
(cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig configure)
endif
ifdef HAVE_WIN32
patch -p0 < Patches/libcaca-win32-static.patch
endif
.caca: libcaca
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && cd caca && make && make install)
......
extras/contrib/src/Patches/libcaca-win32-static.patch 0 → 100644
View file @ 5ae2d471
--- libcaca/caca/caca.h 2010-02-08 13:34:28.000000000 +0100
+++ libcaca.new/caca/caca.h 2010-08-24 19:27:39.000000000 +0200
@@ -31,7 +31,7 @@
#if defined _DOXYGEN_SKIP_ME
#elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT
# define __extern extern __declspec(dllexport)
-#elif defined _WIN32 && !defined __LIBCACA__
+#elif defined _WIN32 && !defined __LIBCACA__ && defined __NULL
# define __extern extern __declspec(dllimport)
#else
# define __extern extern
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