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)
+ -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat
ifdef NDEBUG
CPPFLAGS += -DNDEBUG
endif
cxxsources := \
- auto_proc.cpp browser_widget.cpp child_iterator.cpp \
- link_iterator.cpp pixbufs.cpp style_sheets.cpp temp_file.cpp video.cpp \
- webdvd.cpp x_frame_buffer.cpp xpcom_support.cpp
+ auto_proc.cpp browser_widget.cpp child_iterator.cpp generate_dvd.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)
-DMOZ_VERSION_MINOR=$(moz_version_minor) \
-DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
-browser_widget.% pixbufs.% temp_file.% 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
: CPPFLAGS += $(addprefix -I$(moz_include_dir)/, \
content docshell dom gfx layout necko webshell widget)
+null_prompt_service.% : CPPFLAGS += -I$(moz_include_dir)/uconv
+
%.d : %.cpp
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM -MF $@ $<