X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=48124a2ad0c30bab0c365b52fbc05a1419f0e704;hp=13830561967fad9ecaf609c77c1457cbe5809835;hb=9befd8a8d798f9ae4e0eaacae9b34f6211556292;hpb=c13714f6498df33e02635421354f5fb88a60eb3d diff --git a/Makefile b/Makefile index 1383056..48124a2 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,11 @@ moz_version_major := $(word 1,$(subst ., ,$(moz_version))) moz_version_minor := $(word 2,$(subst ., ,$(moz_version))) moz_version_patchlevel := $(word 3,$(subst ., ,$(moz_version))) -CFLAGS := -Wall +CFLAGS := -ansi -Wall CPPFLAGS := -D_REENTRANT # Non-virtual destructors are fine in XPCOM interface classes since # instances are only ever called by the Release function which is virtual. -CXXFLAGS := -Wall -Wno-non-virtual-dtor +CXXFLAGS := -ansi -Wall -Wno-non-virtual-dtor LDFLAGS := -lpthread $(shell pkg-config --libs gtkmm-2.0 mozilla-gtkmozembed) \ -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat @@ -32,8 +32,9 @@ endif cxxsources := \ auto_proc.cpp browser_widget.cpp child_iterator.cpp generate_dvd.cpp \ - link_iterator.cpp pixbufs.cpp style_sheets.cpp temp_file.cpp video.cpp \ - vob_list.cpp webdvd.cpp x_frame_buffer.cpp xml_utils.cpp xpcom_support.cpp + link_iterator.cpp null_prompt_service.cpp pixbufs.cpp style_sheets.cpp \ + temp_file.cpp video.cpp vob_list.cpp webdvd.cpp x_frame_buffer.cpp \ + xml_utils.cpp xpcom_support.cpp csources := jquant2.c webdvd : $(cxxsources:.cpp=.o) $(csources:.c=.o) @@ -63,8 +64,8 @@ webdvd.% \ browser_widget.% generate_dvd.% pixbufs.% temp_file.% vob_list.% webdvd.% \ : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0) -browser_widget.% child_iterator.o link_iterator.% style_sheets.% webdvd.% \ -xpcom_support.% \ +browser_widget.% child_iterator.o link_iterator.% null_prompt_service.% \ +style_sheets.% webdvd.% xpcom_support.% \ : CPPFLAGS += $(shell pkg-config --cflags mozilla-gtkmozembed) # These dig a bit deeper into Mozilla