Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
ffmpeg2theora
Commits
6c6d5e26
Commit
6c6d5e26
authored
Oct 01, 2008
by
Jan Gerber
Browse files
fix scons build for recent ffmpeg svn versions
parent
cff2c4d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
SConstruct
View file @
6c6d5e26
...
...
@@ -78,7 +78,7 @@ if not conf.CheckPKG(XIPH_LIBS):
Exit
(
1
)
env
.
ParseConfig
(
'pkg-config %s "%s"'
%
(
pkg_flags
,
XIPH_LIBS
))
FFMPEG_LIBS
=
"libav
format libavcodec libavdevice libswscale libpostproc
"
FFMPEG_LIBS
=
"libav
codec libavformat libavdevice libpostproc libswscale
"
if
os
.
path
.
exists
(
"./ffmpeg"
):
os
.
environ
[
'PKG_CONFIG_PATH'
]
=
"./ffmpeg/libavutil:./ffmpeg/libavformat:./ffmpeg/libavcodec:./ffmpeg/libavdevice:./ffmpeg/libswscale:./ffmpeg/libpostproc:"
+
os
.
environ
.
get
(
'PKG_CONFIG_PATH'
,
''
)
if
not
conf
.
CheckPKG
(
FFMPEG_LIBS
):
...
...
@@ -90,7 +90,8 @@ if not conf.CheckPKG(FFMPEG_LIBS):
or run ./get_ffmpeg_svn.sh (for more information see INSTALL)
"""
%
(
FFMPEG_LIBS
,
" "
.
join
([
"%s-dev"
%
l
for
l
in
FFMPEG_LIBS
.
split
()]))
Exit
(
1
)
env
.
ParseConfig
(
'pkg-config %s "%s"'
%
(
pkg_flags
,
FFMPEG_LIBS
))
for
lib
in
FFMPEG_LIBS
.
split
():
env
.
ParseConfig
(
'pkg-config %s "%s"'
%
(
pkg_flags
,
lib
))
KATE_LIBS
=
"oggkate"
if
os
.
path
.
exists
(
"./libkate/misc/pkgconfig"
):
...
...
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