bug 751151 - move harfbuzz to gkmedias.dll on windows. r=khuey

gfx/harfbuzz/src/Makefile.in

@@ -34,7 +34,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE         = harfbuzz
 LIBRARY_NAME   = mozharfbuzz
+ifneq ($(OS_ARCH),WINNT)
 LIBXUL_LIBRARY = 1
+endif
 
 CPPSRCS	=                        \
   hb-blob.cc                     \

layout/media/Makefile.in

@@ -49,7 +49,12 @@ ifeq (WINNT,$(OS_TARGET))
 FORCE_SHARED_LIB = 1
 endif
 
-SHARED_LIBRARY_LIBS = $(MOZ_OTS_LIBS) $(QCMS_LIBS) $(MOZ_CAIRO_LIBS)
+SHARED_LIBRARY_LIBS = \
+    $(MOZ_OTS_LIBS) \
+    $(QCMS_LIBS) \
+    $(MOZ_CAIRO_LIBS) \
+    $(MOZ_HARFBUZZ_LIBS) \
+    $(NULL)
 
 ifdef MOZ_GRAPHITE
 SHARED_LIBRARY_LIBS += $(MOZ_GRAPHITE_LIBS)

layout/media/symbols.def.in

@@ -443,3 +443,43 @@ cairo_win32_surface_create_with_alpha
 cairo_win32_surface_get_height
 cairo_win32_surface_get_width
 cairo_win32_surface_set_can_convert_to_dib
+hb_blob_create
+hb_blob_destroy
+hb_blob_get_data
+hb_blob_get_empty
+hb_blob_get_length
+hb_blob_reference
+hb_buffer_add_utf16
+hb_buffer_create
+hb_buffer_destroy
+hb_buffer_get_glyph_infos
+hb_buffer_get_glyph_positions
+hb_buffer_reverse
+hb_buffer_set_direction
+hb_buffer_set_language
+hb_buffer_set_script
+hb_buffer_set_unicode_funcs
+hb_face_create_for_tables
+hb_face_destroy
+hb_font_create
+hb_font_destroy
+hb_font_funcs_create
+hb_font_funcs_set_glyph_contour_point_func
+hb_font_funcs_set_glyph_func
+hb_font_funcs_set_glyph_h_advance_func
+hb_font_funcs_set_glyph_h_kerning_func
+hb_font_set_funcs
+hb_font_set_ppem
+hb_font_set_scale
+hb_language_from_string
+hb_ot_tag_to_language
+hb_shape
+hb_unicode_funcs_create
+hb_unicode_funcs_get_empty
+hb_unicode_funcs_set_combining_class_func
+hb_unicode_funcs_set_compose_func
+hb_unicode_funcs_set_decompose_func
+hb_unicode_funcs_set_eastasian_width_func
+hb_unicode_funcs_set_general_category_func
+hb_unicode_funcs_set_mirroring_func
+hb_unicode_funcs_set_script_func

toolkit/library/Makefile.in

@@ -339,7 +339,6 @@ EXTRA_DSO_LDOPTS += \
   $(MOZ_JS_LIBS) \
   $(NSS_LIBS) \
   $(MOZ_CAIRO_OSLIBS) \
-  $(MOZ_HARFBUZZ_LIBS) \
   $(MOZ_APP_EXTRA_LIBS) \
   $(SQLITE_LIBS) \
   $(NULL)