RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

sync with FFmpeg build: BUILD_STATIC --> CONFIG_STATIC 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29713 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-09-24 09:47:36 +00:00
parent 4b182ff652
commit 76141a5727
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -8435,7 +8435,7 @@ LIBSWSCALE = $_libswscale
LIBSWSCALE_A = $_libswscale_a LIBSWSCALE_A = $_libswscale_a
LIBSWSCALE_SO = $_libswscale_so LIBSWSCALE_SO = $_libswscale_so
BUILD_STATIC=yes CONFIG_STATIC=yes
SRC_PATH=.. SRC_PATH=..
BUILD_ROOT=.. BUILD_ROOT=..
LIBPREF=lib LIBPREF=lib

6
subdir.mak
View File

@ -5,7 +5,7 @@ include $(SUBDIR)../common.mak
LIBVERSION := $(lib$(NAME)_VERSION) LIBVERSION := $(lib$(NAME)_VERSION)
LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR) LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
ifeq ($(BUILD_STATIC),yes) ifeq ($(CONFIG_STATIC),yes)
all: $(SUBDIR)$(LIBNAME) all: $(SUBDIR)$(LIBNAME)
install-libs: install-lib$(NAME)-static install-libs: install-lib$(NAME)-static
@ -18,7 +18,7 @@ endif
INCINSTDIR := $(INCDIR)/lib$(NAME) INCINSTDIR := $(INCDIR)/lib$(NAME)
THIS_LIB := $(SUBDIR)$($(BUILD_SHARED:yes=S)LIBNAME) THIS_LIB := $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
define RULES define RULES
$(SUBDIR)%$(EXESUF): $(SUBDIR)%.o $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
@ -44,7 +44,7 @@ distclean:: clean
rm -f $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \ rm -f $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
$(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
ifdef BUILD_SHARED ifdef CONFIG_SHARED
all: $(SUBDIR)$(SLIBNAME) all: $(SUBDIR)$(SLIBNAME)
install-libs: install-lib$(NAME)-shared install-libs: install-lib$(NAME)-shared