From: lordmulder <mulder2@gmx.de>
Date: Wed, 13 Aug 2014 13:05:07 +0000 (+0200)
Subject: Added support for Visual Studio 2013 with Update-3.
X-Git-Tag: v2.41~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2179dd9371c0e5c34298a69d2734598faee76992;p=x264-launcher%2Fx264-launcher.git

Added support for Visual Studio 2013 with Update-3.
---

diff --git a/.gitignore b/.gitignore
index 92ce7df..f6d2a33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /etc/_old_
 /etc/sources/*.tar
 /gui/_old_
+/History*.txt
 *.sdf
 *.suo
 *.user
diff --git a/src/global.cpp b/src/global.cpp
index 13f2e5c..1e199d5 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -250,27 +250,23 @@ static inline bool _CHECK_FLAG(const int argc, char **argv, const char *flag)
 	#endif
 #elif defined(_MSC_VER)
 	#if (_MSC_VER == 1800)
-		#if (_MSC_FULL_VER < 180021005)
-			static const char *g_x264_version_compiler = "MSVC 2013-Beta";
-		#elif (_MSC_FULL_VER < 180030501)
+		#if (_MSC_FULL_VER == 180021005)
 			static const char *g_x264_version_compiler = "MSVC 2013";
 		#elif (_MSC_FULL_VER == 180030501)
 			static const char *g_x264_version_compiler = "MSVC 2013.2";
+		#elif (_MSC_FULL_VER == 180030723)
+			static const char *g_x264_version_compiler = "MSVC 2013.3";
 		#else
 			#error Compiler version is not supported yet!
 		#endif
 	#elif (_MSC_VER == 1700)
-		#if (_MSC_FULL_VER < 170050727)
-			static const char *g_x264_version_compiler = "MSVC 2012-Beta";
-		#elif (_MSC_FULL_VER < 170051020)
+		#if (_MSC_FULL_VER == 170050727)
 			static const char *g_x264_version_compiler = "MSVC 2012";
-		#elif (_MSC_FULL_VER < 170051106)
-			static const char *g_x264_version_compiler = "MSVC 2012.1-CTP";
-		#elif (_MSC_FULL_VER < 170060315)
+		#elif (_MSC_FULL_VER == 170051106)
 			static const char *g_x264_version_compiler = "MSVC 2012.1";
-		#elif (_MSC_FULL_VER < 170060610)
+		#elif (_MSC_FULL_VER == 170060315)
 			static const char *g_x264_version_compiler = "MSVC 2012.2";
-		#elif (_MSC_FULL_VER < 170061030)
+		#elif (_MSC_FULL_VER == 170060610)
 			static const char *g_x264_version_compiler = "MSVC 2012.3";
 		#elif (_MSC_FULL_VER == 170061030)
 			static const char *g_x264_version_compiler = "MSVC 2012.4";
@@ -278,12 +274,10 @@ static inline bool _CHECK_FLAG(const int argc, char **argv, const char *flag)
 			#error Compiler version is not supported yet!
 		#endif
 	#elif (_MSC_VER == 1600)
-		#if (_MSC_FULL_VER < 160040219)
-			static const char *g_x264_version_compiler = "MSVC 2010";
-		#elif (_MSC_FULL_VER == 160040219)
+		#if (_MSC_FULL_VER >= 160040219)
 			static const char *g_x264_version_compiler = "MSVC 2010-SP1";
 		#else
-			#error Compiler version is not supported yet!
+			static const char *g_x264_version_compiler = "MSVC 2010";
 		#endif
 	#elif (_MSC_VER == 1500)
 		#if (_MSC_FULL_VER >= 150030729)
diff --git a/src/version.h b/src/version.h
index ea4202d..0cedd7f 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 4
 #define VER_X264_PATCH 0
-#define VER_X264_BUILD 878
+#define VER_X264_BUILD 879
 
 #define VER_X264_PORTABLE_EDITION (0)