X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fenvironment_info.cc;h=31279acfbf539b1be227542d9194af3ebd4a0ab2;hp=b5093e4d6c01a24505e7380286dc80c26bd7c687;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index b5093e4d6..31279acfb 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -24,27 +24,17 @@
 #include "cross.h"
 #include <dcp/version.h>
 #include <libssh/libssh.h>
-#ifdef DCPOMATIC_IMAGE_MAGICK
-#include <magick/MagickCore.h>
-#else
-#include <magick/common.h>
-#include <magick/magick_config.h>
-#endif
-#include <magick/version.h>
 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>
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) log->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-
 using std::string;
 using std::list;
 using std::pair;
@@ -69,13 +59,12 @@ dependency_version_summary ()
 {
 	char buffer[512];
 	snprintf (
-		buffer, sizeof(buffer), "libavcodec %s, libavfilter %s, libavformat %s, libavutil %s, libswscale %s, %s, libssh %s, libdcp %s git %s",
+		buffer, sizeof(buffer), "libavcodec %s, libavfilter %s, libavformat %s, libavutil %s, libswscale %s, libssh %s, libdcp %s git %s",
 		ffmpeg_version_to_string(avcodec_version()).c_str(),
 		ffmpeg_version_to_string(avfilter_version()).c_str(),
 		ffmpeg_version_to_string(avformat_version()).c_str(),
 		ffmpeg_version_to_string(avutil_version()).c_str(),
 		ffmpeg_version_to_string(swscale_version()).c_str(),
-		MagickVersion,
 		ssh_version(0),
 		dcp::version, dcp::git_commit
 		);
@@ -113,10 +102,25 @@ environment_info ()
 	GetVersionEx (&os_info);
 	info.push_back (
 		String::compose (
-			"Windows version %1.%2.%3 SP %4",
-			os_info.dwMajorVersion, os_info.dwMinorVersion, os_info.dwBuildNumber, os_info.szCSDVersion
+			"Windows version %1.%2.%3",
+			(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__