Commit 34ae9a22 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 709721 - Move video and audio libraries in a gkmedias library on Windows. r=khuey

parent b3569be7

browser/installer/package-manifest.in

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@

#endif

#ifdef XP_WIN32

@BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@

#if _MSC_VER == 1400

@BINPATH@/Microsoft.VC80.CRT.manifest

@BINPATH@/msvcm80.dll

config/system-headers

+11 −0
Original line number Diff line number Diff line
@@ -1037,3 +1037,14 @@ shareuiinterface.h 
vpx/vpx_decoder.h

vpx/vp8dx.h

#endif

#ifdef XP_WIN

vpx/vpx_decoder.h

vpx/vp8dx.h

sydneyaudio/sydney_audio.h

vorbis/codec.h

theora/theoradec.h

tremor/ivorbiscodec.h

ogg/ogg.h

ogg/os_types.h

nestegg/nestegg.h

#endif

js/src/config/system-headers

+11 −0
Original line number Diff line number Diff line
@@ -1037,3 +1037,14 @@ shareuiinterface.h 
vpx/vpx_decoder.h

vpx/vp8dx.h

#endif

#ifdef XP_WIN

vpx/vpx_decoder.h

vpx/vp8dx.h

sydneyaudio/sydney_audio.h

vorbis/codec.h

theora/theoradec.h

tremor/ivorbiscodec.h

ogg/ogg.h

ogg/os_types.h

nestegg/nestegg.h

#endif

layout/Makefile.in

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ PARALLEL_DIRS += inspector/tests inspector/tests/chrome 
endif



DIRS           += build

DIRS           += media



ifdef ENABLE_TESTS

PARALLEL_DIRS += \

layout/build/Makefile.in

+0 −22
Original line number Diff line number Diff line
@@ -150,20 +150,6 @@ ifdef MOZ_B2G_RIL #{ 
SHARED_LIBRARY_LIBS	+= $(DEPTH)/dom/system/b2g/$(LIB_PREFIX)domsystemb2g_s.$(LIB_SUFFIX)

endif #}



ifdef MOZ_VORBIS

SHARED_LIBRARY_LIBS 	+= \

	$(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \

	$(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \

	$(NULL)

endif



ifdef MOZ_TREMOR

SHARED_LIBRARY_LIBS	+= \

	$(DEPTH)/media/libtremor/lib/$(LIB_PREFIX)tremor.$(LIB_SUFFIX) \

	$(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \

	$(NULL)

endif



ifdef MOZ_MEDIA

SHARED_LIBRARY_LIBS 	+= \

	$(DEPTH)/content/media/$(LIB_PREFIX)gkconmedia_s.$(LIB_SUFFIX) \
@@ -172,7 +158,6 @@ endif 


ifdef MOZ_OGG

SHARED_LIBRARY_LIBS 	+= \

	$(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \

	$(DEPTH)/content/media/ogg/$(LIB_PREFIX)gkconogg_s.$(LIB_SUFFIX) \

	$(NULL)

endif
@@ -186,11 +171,7 @@ endif 
ifdef MOZ_WEBM

SHARED_LIBRARY_LIBS 	+= \

	$(DEPTH)/content/media/webm/$(LIB_PREFIX)gkconwebm_s.$(LIB_SUFFIX) \

	$(DEPTH)/media/libnestegg/src/$(LIB_PREFIX)nestegg.$(LIB_SUFFIX) \

	$(NULL)

ifndef MOZ_NATIVE_LIBVPX

SHARED_LIBRARY_LIBS 	+= $(DEPTH)/media/libvpx/$(LIB_PREFIX)vpx.$(LIB_SUFFIX)

endif

endif



ifdef MOZ_WAVE
@@ -200,9 +181,6 @@ SHARED_LIBRARY_LIBS += \ 
endif



ifdef MOZ_SYDNEYAUDIO

SHARED_LIBRARY_LIBS 	+= \

	$(DEPTH)/media/libsydneyaudio/src/$(LIB_PREFIX)sydneyaudio.$(LIB_SUFFIX) \

	$(NULL)

LOCAL_INCLUDES += -I$(DEPTH)/content/html/content/src

endif