mirror of
https://github.com/mpv-player/mpv
synced 2025-01-01 04:36:24 +01:00
Sync with latest FFmpeg changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28479 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
38daeba8f8
commit
481d68007e
@ -48,8 +48,8 @@ ifeq ($(wildcard $(SVN_ENTRIES)),$(SVN_ENTRIES))
|
|||||||
$(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
|
$(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(BUILD_ROOT_REL)/version.h:
|
$(BUILD_ROOT_REL)/version.h: $(SRC_PATH_BARE)/version.sh
|
||||||
$(SRC_PATH)/version.sh $(SRC_PATH) $@ $(EXTRA_VERSION)
|
$< $(SRC_PATH) $@ $(EXTRA_VERSION)
|
||||||
|
|
||||||
install: install-libs install-headers
|
install: install-libs install-headers
|
||||||
|
|
||||||
@ -71,7 +71,7 @@ TESTS := $(addprefix $(SUBDIR),$(TESTS))
|
|||||||
|
|
||||||
DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
|
DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
|
||||||
|
|
||||||
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h))
|
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
|
||||||
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
|
checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
|
||||||
|
|
||||||
DEPS := $(OBJS:.o=.d)
|
DEPS := $(OBJS:.o=.d)
|
||||||
|
Loading…
Reference in New Issue
Block a user