X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fenvironment_info.cc;h=6fb75a0371e1cfebe57be9480ae6e3e7a681427a;hb=ed2731617eb2c3db15cb3c57e880ecd39c375751;hp=4cdadafb659211b7aa43a2ebe334e516357caf31;hpb=e7cd5e4ee467386ff579a76c5f6a6fee03a78fc4;p=dcpomatic.git

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 4cdadafb6..6fb75a037 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -25,17 +25,25 @@
 #include <dcp/version.h>
 #include <libssh/libssh.h>
 #ifdef DCPOMATIC_IMAGE_MAGICK
+/* ImageMagick */
+#ifdef DCPOMATIC_MAGICKCORE_MAGICK
 #include <magick/MagickCore.h>
+#include <magick/version.h>
+#else
+#include <MagickCore/MagickCore.h>
+#include <MagickCore/version.h>
+#endif
 #else
+/* GraphicsMagick */
 #include <magick/common.h>
 #include <magick/magick_config.h>
-#endif
 #include <magick/version.h>
+#endif
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavfilter/avfilter.h>
 #include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
 #include <libavutil/pixfmt.h>
 }
 #include <boost/thread.hpp>
@@ -117,6 +125,21 @@ environment_info ()
 			(int) os_info.dwMajorVersion, (int) os_info.dwMinorVersion, (int) os_info.dwBuildNumber
 			)
 		);
+	if (os_info.dwMajorVersion == 5 && os_info.dwMinorVersion == 0) {
+		info.push_back ("Windows 2000");
+	} else if (os_info.dwMajorVersion == 5 && os_info.dwMinorVersion == 1) {
+		info.push_back ("Windows XP");
+	} else if (os_info.dwMajorVersion == 5 && os_info.dwMinorVersion == 2) {
+		info.push_back ("Windows XP 64-bit or Windows Server 2003");
+	} else if (os_info.dwMajorVersion == 6 && os_info.dwMinorVersion == 0) {
+		info.push_back ("Windows Vista or Windows Server 2008");
+	} else if (os_info.dwMajorVersion == 6 && os_info.dwMinorVersion == 1) {
+		info.push_back ("Windows 7 or Windows Server 2008");
+	} else if (os_info.dwMajorVersion == 6 && (os_info.dwMinorVersion == 2 || os_info.dwMinorVersion == 3)) {
+		info.push_back ("Windows 8 or Windows Server 2012");
+	} else if (os_info.dwMajorVersion == 10 && os_info.dwMinorVersion == 0) {
+		info.push_back ("Windows 10 or Windows Server 2016");
+	}
 #endif
 
 #if __GNUC__