merge with dev

2020-03-19 13:40:11 +01:00
parent 54fdc848f0 d63fb77c8c
commit e573de78b4
169 changed files with 11568 additions and 5931 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -20,7 +20,15 @@

 #include <set>
 #include <vector>
+#if defined __has_include
+#if __has_include(<gtkmm/enums.h>)
 #include <gtkmm/enums.h>
+#else
+#include <gtkmm-3.0/gtkmm/enums.h>
+#endif
+#else
+#include <gtkmm/enums.h>
+#endif
 #include "../rtengine/settings.h"
 #include <exception>