Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
3ae0e721
Commit
3ae0e721
authored
9 years ago
by
Luca Barbato
Browse files
Options
Downloads
Patches
Plain Diff
checkasm: Always link statically
Checkasm needs to use internal symbols that should not be made public.
parent
6b2b26e7
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+1
-0
1 addition, 0 deletions
Makefile
common.mak
+3
-2
3 additions, 2 deletions
common.mak
tests/checkasm/Makefile
+2
-2
2 additions, 2 deletions
tests/checkasm/Makefile
with
6 additions
and
4 deletions
Makefile
+
1
−
0
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)
...
...
This diff is collapsed.
Click to expand it.
common.mak
+
3
−
2
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
))
...
...
This diff is collapsed.
Click to expand it.
tests/checkasm/Makefile
+
2
−
2
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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment