Skip to content

V
vlc-1.1
Commit f65a4386 authored by Damien Fouilleul's avatar Damien Fouilleul
Browse files
Options

- contribs: cleanup pthreads for win32 target

parent 12a27bac
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
extras/contrib/src/Makefile
View file @ f65a4386
...@@ -1602,7 +1602,11 @@ zvbi-$(ZVBI_VERSION).tar.bz2: ...@@ -1602,7 +1602,11 @@ zvbi-$(ZVBI_VERSION).tar.bz2:
zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
ifdef HAVE_WIN32
.zvbi: zvbi .pthreads
else
.zvbi: zvbi .zvbi: zvbi
endif
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install) (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
else else
...@@ -2167,7 +2171,7 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz ...@@ -2167,7 +2171,7 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
.pthreads: pthreads .pthreads: pthreads
(cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-inlined; cp pthread.h ../../include/; cp *.dll *.a ../../lib/) (cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && cp pthread.h sched.h semaphore.h $(PREFIX)/include/ && cp *.a $(PREFIX)/lib/)
$(INSTALL_NAME) $(INSTALL_NAME)
touch $@ touch $@
......
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