Added workaround for XULRunner 1.9's requirement of 16-bit wchar_t. Changing the...

[videolink.git] / Makefile

diff --git a/Makefile b/Makefile
index 9a62d7e2be49e66ebe55aaa3ecf06c2bfa37291e..d0bd9971c12474713a2fc3c1a9a15d40f753a541 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,8 @@ $(sources_using_gtkmm:%.cpp=.objs/%.o) \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.4)
 
 $(sources_using_moz:%.cpp=.objs/%.o) \
-    : CPPFLAGS += $(shell pkg-config --cflags $(moz_pc)) $(moz_cppflags_extra)
+    : CPPFLAGS += $(filter-out -fshort-wchar, \
+                   $(shell pkg-config --cflags $(moz_pc)) $(moz_cppflags_extra))
 # Non-virtual destructors are fine in XPCOM interface classes since
 # instances are only ever called by the Release function which is virtual.
 $(sources_using_moz:%.cpp=.objs/%.o) : CXXFLAGS += -Wno-non-virtual-dtor