[x265] [PATCH 2/2] Fix x86_64 build

Rafaël Carré funman at videolan.org
Wed Mar 5 13:47:33 CET 2014


I know, I sent patches to mercurial to properly apply git patches with utf8,
but never finished them :/

Can you e.g. apply the diff manually and fix my name after?

I'm using git hg clone for all my development so making a hg patch is
not easy for me.

If you have a suggestion I'm all ears though

On 03/05/14 12:15, Deepthi Nandakumar wrote:
> Can you convert this to an hg patch? Git patches don't apply cleanly....
> 
> 
> On Wed, Mar 5, 2014 at 4:08 PM, Rafaël Carré <funman at videolan.org> wrote:
> 
>> ---
>>  source/CMakeLists.txt | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
>> index 2febfaa..d2fea1a 100644
>> --- a/source/CMakeLists.txt
>> +++ b/source/CMakeLists.txt
>> @@ -21,7 +21,7 @@ configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
>>
>>  SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake"
>> "${CMAKE_MODULE_PATH}")
>>
>> -if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386" OR ${CMAKE_SYSTEM_PROCESSOR}
>> STREQUAL "x86")
>> +if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386" OR ${CMAKE_SYSTEM_PROCESSOR}
>> STREQUAL "x86" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
>>      set(X86 1)
>>      add_definitions(-DX265_ARCH_X86=1)
>>      if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
>> --
>> 1.9.0


More information about the x265-devel mailing list