From babeb5c556de6f9686f5cd47133d0c40c07bfc2e Mon Sep 17 00:00:00 2001 From: Moonchild Date: Sat, 2 Jan 2021 13:35:39 +0000 Subject: Issue #61 - Reinstate buildability with shared gkmedias dll This fully works for splitting gkmedias.dll back out from xul with one exception which is Skia throwing undefined externals when linking gkmedias. --- config/moz.build | 3 +++ config/system-headers | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) (limited to 'config') diff --git a/config/moz.build b/config/moz.build index fccf5cbcd..3e95e46d2 100644 --- a/config/moz.build +++ b/config/moz.build @@ -28,6 +28,9 @@ if CONFIG['HOST_OS_ARCH'] != 'WINNT': # while the program here is in C. HostProgram('nsinstall_real', c_only=True) +if CONFIG['GKMEDIAS_SHARED_LIBRARY']: + DEFINES['GKMEDIAS_SHARED_LIBRARY'] = True + PYTHON_UNIT_TESTS += [ 'tests/test_mozbuild_reading.py', 'tests/unit-expandlibs.py', diff --git a/config/system-headers b/config/system-headers index 015644428..76c79c915 100644 --- a/config/system-headers +++ b/config/system-headers @@ -1287,6 +1287,22 @@ QtSparql/qsparqlresult.h #if MOZ_TREE_PIXMAN!=1 pixman.h #endif +#ifdef GKMEDIAS_SHARED_LIBRARY +vpx/vpx_codec.h +vpx/vpx_decoder.h +vpx/vpx_encoder.h +vpx/vp8cx.h +vpx/vp8dx.h +vpx_mem/vpx_mem.h +vorbis/codec.h +theora/theoradec.h +tremor/ivorbiscodec.h +speex/speex_resampler.h +ogg/ogg.h +ogg/os_types.h +nestegg/nestegg.h +cubeb/cubeb.h +#endif gst/gst.h gst/app/gstappsink.h gst/app/gstappsrc.h -- cgit v1.2.3