mirror of https://github.com/mpv-player/mpv
Sync with FFmpeg r7634.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21993 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
2e66db0c4a
commit
f7c520b74d
|
@ -33,10 +33,6 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
|
||||||
%.o: %.S
|
%.o: %.S
|
||||||
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
|
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
# BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
|
|
||||||
%.o: %.cpp
|
|
||||||
g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
|
|
||||||
|
|
||||||
%: %.o $(LIB)
|
%: %.o $(LIB)
|
||||||
$(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
|
$(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
|
||||||
|
|
||||||
|
@ -69,6 +65,7 @@ install-lib-shared: $(SLIBNAME)
|
||||||
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
|
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
|
||||||
cd "$(shlibdir)" && \
|
cd "$(shlibdir)" && \
|
||||||
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
|
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
|
||||||
|
$(SLIB_INSTALL_EXTRA_CMD)
|
||||||
|
|
||||||
install-lib-static: $(LIB)
|
install-lib-static: $(LIB)
|
||||||
install -d "$(libdir)"
|
install -d "$(libdir)"
|
||||||
|
|
Loading…
Reference in New Issue