X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile;h=d0bd9971c12474713a2fc3c1a9a15d40f753a541;hb=refs%2Ftags%2F1.2.5-1;hp=9a62d7e2be49e66ebe55aaa3ecf06c2bfa37291e;hpb=1363abe723ead6b64896ccd0e7875c4ae8bca706;p=videolink.git diff --git a/Makefile b/Makefile index 9a62d7e..d0bd997 100644 --- 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