diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2024-01-08 12:32:33 -0500 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2024-01-08 12:32:33 -0500 |
| commit | be3367fdbfaf7b62b94105cd55d1b9f1e30e9e58 (patch) | |
| tree | e593aaaefa37907b3ad81a1f81d2d538eef920de /src/codec | |
| parent | 342e613fba5849c11a07d568f765f512f30ea6cf (diff) | |
| download | camu-be3367fdbfaf7b62b94105cd55d1b9f1e30e9e58.tar.gz camu-be3367fdbfaf7b62b94105cd55d1b9f1e30e9e58.tar.bz2 camu-be3367fdbfaf7b62b94105cd55d1b9f1e30e9e58.zip | |
Cleanup
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/codec')
| -rw-r--r-- | src/codec/meson.build | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/codec/meson.build b/src/codec/meson.build index b4472fb..a3951f0 100644 --- a/src/codec/meson.build +++ b/src/codec/meson.build @@ -11,15 +11,6 @@ av_src = [ av_inc = [] av_deps = [] -#libdir = meson.source_root() + '/build-mingw/subprojects/ffmpeg-6.0/dist/msys64/clang64lib' -#incdir = meson.source_root() + '/build-mingw/subprojects/ffmpeg-6.0/dist/msys64/clang64include' -#av_inc += [include_directories(incdir)] -#libavutil = compiler.find_library('avutil', dirs: libdir) -#libavformat = compiler.find_library('avformat', dirs: libdir) -#libavcodec = compiler.find_library('avcodec', dirs: libdir) -#libswresample = compiler.find_library('swresample', dirs: libdir) -#libswscale = compiler.find_library('swscale', dirs: libdir) - libavutil = dependency('libavutil', required: false) libavformat = dependency('libavformat', required: false) libavcodec = dependency('libavcodec', required: false) @@ -33,6 +24,12 @@ if not (libavutil.found() and libavformat.found() and libavcodec.found() and lib libavcodec = av_proj.get_variable('avcodec') libswresample = av_proj.get_variable('swresample') libswscale = av_proj.get_variable('swscale') + #libdir = av_proj.get_variable('libdir') + #libavutil = compiler.find_library('avutil', dirs: libdir) + #libavformat = compiler.find_library('avformat', dirs: libdir) + #libavcodec = compiler.find_library('avcodec', dirs: libdir) + #libswresample = compiler.find_library('swresample', dirs: libdir) + #libswscale = compiler.find_library('swscale', dirs: libdir) zlib = compiler.find_library('z', required: false) if zlib.found() av_deps += [zlib] @@ -41,9 +38,7 @@ if not (libavutil.found() and libavformat.found() and libavcodec.found() and lib if soxr.found() av_deps += [soxr] endif - if av_proj.get_variable('is_msvc') - av_deps += [compiler.find_library('Bcrypt', required: true)] - endif + av_deps += [compiler.find_library('bcrypt')] av_inc += [av_proj.get_variable('inc')] endif endif |