Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
3b26ee47
Commit
3b26ee47
authored
Jul 08, 2007
by
Måns Rullgård
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix build after breakage in r9544
Originally committed as revision 9546 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
84662c01
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
10 deletions
+16
-10
Makefile
Makefile
+15
-9
configure
configure
+1
-1
No files found.
Makefile
View file @
3b26ee47
...
...
@@ -34,17 +34,18 @@ ifeq ($(CONFIG_VHOOK),yes)
all
:
videohook
install
:
install-vhook
endif
VHOOKCFLAGS
+=
$
(
filter-out
-mdynamic-no-pic
,
$(CFLAGS)
)
HOOKS
=
vhook/null
$(SLIBSUF)
vhook/fish
$(SLIBSUF)
vhook/ppm
$(SLIBSUF)
vhook/watermark
$(SLIBSUF)
ALLHOOKS
=
$(HOOKS)
vhook/imlib2
$(SLIBSUF)
vhook/drawtext
$(SLIBSUF)
ALLHOOKS_SRCS
:=
$
(
ALLHOOKS:
$(SLIBSUF)
=
.c
)
ifeq
($(HAVE_IMLIB2),yes)
HOOKS
+=
vhook/imlib2
$(SLIBSUF)
CFLAGS
+=
`
imlib2-config
--cflags
`
VHOOK
CFLAGS
+=
`
imlib2-config
--cflags
`
LIBS_imlib2$(SLIBSUF)
=
`imlib2-config
--libs`
endif
ifeq
($(HAVE_FREETYPE2),yes)
HOOKS
+=
vhook/drawtext
$(SLIBSUF)
CFLAGS
+=
`
freetype-config
--cflags
`
VHOOK
CFLAGS
+=
`
freetype-config
--cflags
`
LIBS_drawtext$(SLIBSUF)
=
`freetype-config
--libs`
endif
...
...
@@ -109,14 +110,16 @@ ffplay.o: CFLAGS += $(SDL_CFLAGS)
ffmpeg.o ffplay.o ffserver.o
:
version.h
%.o
:
%.c
$(CC)
$(CFLAGS)
-c
-o
$@
$<
videohook
:
.libs $(HOOKS)
vhook/%$(SLIBSUF)
:
vhook/%.o
$(CC)
$(LDFLAGS)
-o
$@
$(VHOOKSHFLAGS)
$<
$(VHOOKLIBS)
$
(
LIBS_
$
@
)
$(CC)
$(LDFLAGS)
-o
$@
$(VHOOKSHFLAGS)
$<
$(VHOOKLIBS)
$
(
LIBS_
$
(
@F
)
)
vhook/%.o
:
vhook/%.c
$(CC)
$(VHOOKCFLAGS)
-c
-o
$@
$<
%.o
:
%.c
$(CC)
$(CFLAGS)
-c
-o
$@
$<
documentation
:
$(addprefix doc/
,
ffmpeg-doc.html faq.html ffserver-doc.html
\
ffplay-doc.html hooks.html $(ALLMANPAGES))
...
...
@@ -202,7 +205,7 @@ uninstall-headers:
$(MAKE)
-C
libpostproc uninstall-headers
-
rmdir
"
$(incdir)
"
depend dep
:
.depend
depend dep
:
.depend
.vhookdep
$(MAKE)
-C
libavutil depend
$(MAKE)
-C
libavcodec depend
$(MAKE)
-C
libavformat depend
...
...
@@ -215,8 +218,10 @@ endif
.depend
:
$(SRCS) version.h
$(CC)
-MM
$(CFLAGS)
$(SDL_CFLAGS)
$
(
filter-out %.h,
$^
)
1>.depend
for
file
in
$(ALLHOOKS_SRCS)
;
do
\
$(CC)
$(CFLAGS)
-MM
-MT
$(SRC_PATH)
/
$$
file
$(SRC_PATH)
/
$$
file
>>
.depend
;
done
# gcc stupidly only outputs the basename of targets
.vhookdep
:
$(ALLHOOKS_SRCS)
$(CC)
$(VHOOKCFLAGS)
-MM
$^
|
sed
's,^\([a-z]\),vhook/\1,'
>
$@
$(DEP_LIBS)
:
lib
...
...
@@ -314,3 +319,4 @@ tests/seek_test$(EXESUF): tests/seek_test.c
.PHONY
:
mpeg4 mpeg ac3 snow snowll swscale-error
-include
.depend
-include
.vhookdep
configure
View file @
3b26ee47
...
...
@@ -1757,7 +1757,7 @@ if enabled gprof; then
add_ldflags
"-p"
fi
VHOOKCFLAGS
=
"-fPIC
`
echo
$CFLAGS
|
sed
s/-mdynamic-no-pic//
`
"
VHOOKCFLAGS
=
"-fPIC"
# find if .align arg is power-of-two or not
if
test
$asmalign_pot
=
"unknown"
;
then
...
...
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