Fixup for windows builds after bug 644608. rs=Ms2ger
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 06 Apr 2012 13:36:37 +0200
changeset 94480 828112609eb9cfdc9a6bffcb79635ec2989e3a09
parent 94479 92cc2053db2f352389d2ef637457d56c9fd69eff
child 94481 4ea78fe84b7c7975578af0487447c8cb1f39ab5d
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
bugs644608
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fixup for windows builds after bug 644608. rs=Ms2ger
layout/media/Makefile.in
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -101,21 +101,22 @@ EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSP
 
 # OTS uses uncompress2() from libz, so we need to link with this
 ifdef MOZ_NATIVE_ZLIB
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
 else
 EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS)
 endif
 
-ifdef MOZ_CUBEB
-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME, winmm)
-endif
-
 DEFFILE = symbols.def
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq (WINNT,$(OS_TARGET))
 symbols.def: symbols.def.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(ACDEFINES) $< > $@
+
+ifdef MOZ_CUBEB
+OS_LIBS += $(call EXPAND_LIBNAME, winmm)
 endif
+
+endif