Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Added support for Visual Studio 2013 with Update-3.

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-08-13 15:05:07 +02:00
parent dd4e1132ea
commit 2179dd9371
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
/etc/_old_ /etc/_old_
/etc/sources/*.tar /etc/sources/*.tar
/gui/_old_ /gui/_old_
/History*.txt
*.sdf *.sdf
*.suo *.suo
*.user *.user

24
src/global.cpp
View File

@ -250,27 +250,23 @@ static inline bool _CHECK_FLAG(const int argc, char **argv, const char *flag)
#endif #endif
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#if (_MSC_VER == 1800) #if (_MSC_VER == 1800)
#if (_MSC_FULL_VER < 180021005) #if (_MSC_FULL_VER == 180021005)
static const char *g_x264_version_compiler = "MSVC 2013-Beta";
#elif (_MSC_FULL_VER < 180030501)
static const char *g_x264_version_compiler = "MSVC 2013"; static const char *g_x264_version_compiler = "MSVC 2013";
#elif (_MSC_FULL_VER == 180030501) #elif (_MSC_FULL_VER == 180030501)
static const char *g_x264_version_compiler = "MSVC 2013.2"; 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 #else
#error Compiler version is not supported yet! #error Compiler version is not supported yet!
#endif #endif
#elif (_MSC_VER == 1700) #elif (_MSC_VER == 1700)
#if (_MSC_FULL_VER < 170050727) #if (_MSC_FULL_VER == 170050727)
static const char *g_x264_version_compiler = "MSVC 2012-Beta";
#elif (_MSC_FULL_VER < 170051020)
static const char *g_x264_version_compiler = "MSVC 2012"; static const char *g_x264_version_compiler = "MSVC 2012";
#elif (_MSC_FULL_VER < 170051106) #elif (_MSC_FULL_VER == 170051106)
static const char *g_x264_version_compiler = "MSVC 2012.1-CTP";
#elif (_MSC_FULL_VER < 170060315)
static const char *g_x264_version_compiler = "MSVC 2012.1"; 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"; 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"; static const char *g_x264_version_compiler = "MSVC 2012.3";
#elif (_MSC_FULL_VER == 170061030) #elif (_MSC_FULL_VER == 170061030)
static const char *g_x264_version_compiler = "MSVC 2012.4"; 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! #error Compiler version is not supported yet!
#endif #endif
#elif (_MSC_VER == 1600) #elif (_MSC_VER == 1600)
#if (_MSC_FULL_VER < 160040219) #if (_MSC_FULL_VER >= 160040219)
static const char *g_x264_version_compiler = "MSVC 2010";
#elif (_MSC_FULL_VER == 160040219)
static const char *g_x264_version_compiler = "MSVC 2010-SP1"; static const char *g_x264_version_compiler = "MSVC 2010-SP1";
#else #else
#error Compiler version is not supported yet! static const char *g_x264_version_compiler = "MSVC 2010";
#endif #endif
#elif (_MSC_VER == 1500) #elif (_MSC_VER == 1500)
#if (_MSC_FULL_VER >= 150030729) #if (_MSC_FULL_VER >= 150030729)

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 4 #define VER_X264_MINOR 4
#define VER_X264_PATCH 0 #define VER_X264_PATCH 0
#define VER_X264_BUILD 878 #define VER_X264_BUILD 879
#define VER_X264_PORTABLE_EDITION (0) #define VER_X264_PORTABLE_EDITION (0)