diff options
| author | Alfred E. Heggestad <aeh@db.org> | 2016-05-18 20:05:05 +0200 |
|---|---|---|
| committer | Alfred E. Heggestad <aeh@db.org> | 2016-05-18 20:05:05 +0200 |
| commit | cf502319c57e67d5321882dcf5a1f15c7207e041 (patch) | |
| tree | ec8cf1d64b4bf65f1537a84eddbaf378bff90a1f /mk | |
| parent | 3ebdfd3eed6604843887257661fc7281aa75c821 (diff) | |
gtk: check for both gtk+-2.0 and glib-2.0
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index b01d93e..b674a92 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -110,6 +110,8 @@ USE_GST_VIDEO := \ && echo "yes") USE_GST_VIDEO1 := $(shell pkg-config --exists gstreamer-1.0 gstreamer-app-1.0 \ && echo "yes") +USE_GTK := $(shell pkg-config 'gtk+-2.0 >= 2.22' && \ + pkg-config 'glib-2.0 >= 2.32' && echo "yes") ifneq ($(USE_AVCODEC),) USE_H265 := $(shell [ -f $(SYSROOT)/include/x265.h ] || \ [ -f $(SYSROOT)/local/include/x265.h ] || \ @@ -200,9 +202,6 @@ USE_VPX := $(shell [ -f $(SYSROOT)/include/vpx/vp8.h ] \ || [ -f $(SYSROOT)/local/include/vpx/vp8.h ] \ || [ -f $(SYSROOT_ALT)/include/vpx/vp8.h ] \ && echo "yes") -USE_GTK := $(shell [ -f $(SYSROOT)/include/gtk-2.0/gtk/gtk.h ] || \ - [ -f $(SYSROOT)/local/include/gtk-2.0/gtk/gtk.h ] || \ - [ -f $(SYSROOT_ALT)/include/gtk-2.0/gtk/gtk.h ] && echo "yes") else # Windows. # Accounts for mingw with Windows SDK (formerly known as Platform SDK) @@ -342,6 +341,9 @@ endif ifneq ($(USE_GST_VIDEO1),) MODULES += gst_video1 endif +ifneq ($(USE_GTK),) +MODULES += gtk +endif ifneq ($(USE_H265),) MODULES += h265 endif @@ -423,10 +425,6 @@ endif ifneq ($(USE_ZRTP),) MODULES += zrtp endif -ifneq ($(USE_GTK),) -MODULES += gtk -endif - ifneq ($(USE_DSHOW),) MODULES += dshow endif |