git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e4b79c
)
Don't use pic on win32. it confuses nasm
author
Christophe Mutricy
<xtophe@videolan.org>
Tue, 19 Dec 2006 20:18:55 +0000
(20:18 +0000)
committer
Christophe Mutricy
<xtophe@videolan.org>
Tue, 19 Dec 2006 20:18:55 +0000
(20:18 +0000)
extras/contrib/src/Makefile
patch
|
blob
|
history
diff --git
a/extras/contrib/src/Makefile
b/extras/contrib/src/Makefile
index
937216e
..
f52bbe5
100644
(file)
--- a/
extras/contrib/src/Makefile
+++ b/
extras/contrib/src/Makefile
@@
-1216,10
+1216,11
@@
endif
ifdef HAVE_WIN32
.x264: x264 .pthreads
+ (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
else
.x264: x264
+ (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-pic && make && make install)
endif
- (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-pic && make && make install)
touch $@
CLEAN_FILE += .x264