Skip to content

Commit

Permalink
Added vorbisenc and vorbisfile libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
runei committed Aug 8, 2024
1 parent d4c12ee commit 53cbf1e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
17 changes: 1 addition & 16 deletions 3rdparty/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -268,21 +268,6 @@ elif 'sndfile' in system_dependencies:
if 'libogg' in autobuild_dependencies:
env.BuildThirdParty(thirdparty_versions, 'libogg')

conf = Configure(env, custom_tests=env.CustomTests)

env = conf.Finish()

elif 'libogg' in system_dependencies:
conf = Configure(env, custom_tests=env.CustomTests)

if not conf.AddPkgConfigDependency('ogg', '--cflags --libs', exclude_from_pc=True):
conf.env.AddManualDependency(libs=['ogg'], exclude_from_pc=True)

if not conf.CheckLibWithHeaderExt('ogg', 'ogg/ogg.h', 'C', run=False):
env.Die("libogg not found (see 'config.log' for details)")

env = conf.Finish()

# dep: libvorbis
if 'libvorbis' in autobuild_dependencies:
pa_deps = [
Expand All @@ -297,7 +282,7 @@ elif 'libvorbis' in system_dependencies:
conf = Configure(env, custom_tests=env.CustomTests)

if not conf.AddPkgConfigDependency('vorbis', '--cflags --libs', exclude_from_pc=True):
conf.env.AddManualDependency(libs=['vorbis'], exclude_from_pc=True)
conf.env.AddManualDependency(libs=['vorbis', 'vorbisenc', 'vorbisfile'], exclude_from_pc=True)

if not conf.CheckLibWithHeaderExt('vorbis', 'vorbis/vorbisenc.h', 'C', run=False):
env.Die("libvorbis not found (see 'config.log' for details)")
Expand Down
2 changes: 2 additions & 0 deletions scripts/scons_helpers/build-3rdparty.py
Original file line number Diff line number Diff line change
Expand Up @@ -1476,6 +1476,8 @@ def die(text, *args):
execute_make(ctx)
install_tree(ctx, 'include', ctx.pkg_inc_dir, include=['*.h'])
install_files(ctx, 'lib/.libs/libvorbis.a', ctx.pkg_lib_dir)
install_files(ctx, 'lib/.libs/libvorbisenc.a', ctx.pkg_lib_dir)
install_files(ctx, 'lib/.libs/libvorbisfile.a', ctx.pkg_lib_dir)
elif ctx.pkg_name == 'ltdl':
download(
ctx,
Expand Down

0 comments on commit 53cbf1e

Please sign in to comment.