From: Ben Hutchings Date: Thu, 15 Dec 2005 00:50:55 +0000 (+0000) Subject: Added definition of Mozilla version components for use in webdvd.cpp. X-Git-Tag: 0.5~1 X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=commitdiff_plain;h=15072d864fc8f74ffd40a6d966622bcf55d8a44b Added definition of Mozilla version components for use in webdvd.cpp. --- diff --git a/Makefile b/Makefile index be6565e..989ef7d 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,13 @@ moz_include_dir := \ moz_lib_dir := \ $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/lib/mozilla +moz_version := \ + $(shell sed 's/\#define MOZILLA_VERSION "\(.*\)"/\1/; t; d' \ + < $(moz_include_dir)/mozilla-config.h) +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 CPPFLAGS := -D_REENTRANT # Non-virtual destructors are fine in XPCOM interface classes since @@ -47,7 +54,11 @@ install : browserwidget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"' -webdvd.% : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"' +webdvd.% \ + : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"' \ + -DMOZ_VERSION_MAJOR=$(moz_version_major) \ + -DMOZ_VERSION_MINOR=$(moz_version_minor) \ + -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel) browserwidget.% pixbufs.% temp_file.% webdvd.% \ : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)