Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
3ae0e721
Commit
3ae0e721
authored
Jul 21, 2015
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
checkasm: Always link statically
Checkasm needs to use internal symbols that should not be made public.
parent
6b2b26e7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
Makefile
Makefile
+1
-0
common.mak
common.mak
+3
-2
Makefile
tests/checkasm/Makefile
+2
-2
No files found.
Makefile
View file @
3ae0e721
...
...
@@ -100,6 +100,7 @@ include $(SRC_PATH)/common.mak
FF_EXTRALIBS
:=
$(FFEXTRALIBS)
FF_DEP_LIBS
:=
$(DEP_LIBS)
FF_STATIC_DEP_LIBS
:=
$(STATIC_DEP_LIBS)
all
:
$(AVPROGS)
...
...
common.mak
View file @
3ae0e721
...
...
@@ -24,8 +24,9 @@ TOOLOBJS := $(TOOLS:%=tools/%.o)
TOOLS := $(TOOLS:%=tools/%$(EXESUF))
HEADERS += $(HEADERS-yes)
PATH_LIBNAME = $(foreach NAME,$(1),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME))
DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))
PATH_LIBNAME = $(foreach NAME,$(1),lib$(NAME)/$($(2)LIBNAME))
DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib),$(CONFIG_SHARED:yes=S)))
STATIC_DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib)))
SRC_DIR := $(SRC_PATH)/lib$(NAME)
ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
...
...
tests/checkasm/Makefile
View file @
3ae0e721
...
...
@@ -22,8 +22,8 @@ tests/checkasm/%.o: CFLAGS := $(CFLAGS:-Wstrict-prototypes=-Wno-strict-prototype
CHECKASM
:=
tests/checkasm/checkasm
$(EXESUF)
$(CHECKASM)
:
$(EXEOBJS) $(CHECKASMOBJS) $(FF_DEP_LIBS)
$(LD)
$(LDFLAGS)
$(LDEXEFLAGS)
$(LD_O)
$(CHECKASMOBJS)
$(FF_EXTRALIBS)
$(CHECKASM)
:
$(EXEOBJS) $(CHECKASMOBJS) $(FF_
STATIC_
DEP_LIBS)
$(LD)
$(LDFLAGS)
$(LDEXEFLAGS)
$(LD_O)
$(CHECKASMOBJS)
$(FF_
STATIC_DEP_LIBS)
$(
EXTRALIBS)
checkasm
:
$(CHECKASM)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment