<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Oct 23, 2013 at 7:48 AM, Jan Ekström <span dir="ltr"><<a href="mailto:jeebjp@gmail.com" target="_blank">jeebjp@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"># HG changeset patch<br>
# User Jan Ekström <<a href="mailto:jeebjp@gmail.com">jeebjp@gmail.com</a>><br>
# Date 1382531113 -10800<br>
# Wed Oct 23 15:25:13 2013 +0300<br>
# Node ID 8dff80805f790c70e89890ba0d20643b93b2a5ed<br>
# Parent 6d96d64c4e9a2c526b57274760a7147241328cb3<br>
Fix compilation with Visual Studio 2013<br>
<br>
The <algorithm> header is needed for std::min and friends,<br>
and the CMakeLists.txt modification makes the version check<br>
match what is used in the source code.<br>
<br>
Unfortunately cmake does not seem to contain a GREATER_OR_EQUAL<br>
macro, so NOT(LESS) has to be used.<br></blockquote><div><br></div><div>Thanks, queued for stable</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r 6d96d64c4e9a -r 8dff80805f79 source/Lib/TLibCommon/TComRom.h<br>
--- a/source/Lib/TLibCommon/TComRom.h Tue Oct 22 23:36:36 2013 +0530<br>
+++ b/source/Lib/TLibCommon/TComRom.h Wed Oct 23 15:25:13 2013 +0300<br>
@@ -42,6 +42,7 @@<br>
<br>
#include <stdio.h><br>
#include <iostream><br>
+#include <algorithm><br>
<br>
namespace x265 {<br>
// private namespace<br>
diff -r 6d96d64c4e9a -r 8dff80805f79 source/common/CMakeLists.txt<br>
--- a/source/common/CMakeLists.txt Tue Oct 22 23:36:36 2013 +0530<br>
+++ b/source/common/CMakeLists.txt Wed Oct 23 15:25:13 2013 +0300<br>
@@ -97,7 +97,7 @@<br>
vec/intra-ssse3.cpp vec/intra-sse41.cpp vec/pixel16-sse41.cpp<br>
PROPERTIES COMPILE_FLAGS /arch:SSE2)<br>
endif()<br>
- if (MSVC_VERSION EQUAL 1700 OR INTEL_CXX)<br>
+ if (NOT (MSVC_VERSION LESS 1700) OR INTEL_CXX)<br>
set(PRIMITIVES ${PRIMITIVES} vec/blockcopy-avx2.cpp vec/pixel-avx2.cpp)<br>
set_source_files_properties(vec/blockcopy-avx2.cpp vec/pixel-avx2.cpp<br>
PROPERTIES COMPILE_FLAGS /arch:AVX)<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Steve Borho
</div></div>