]>
Commit | Line | Data |
---|---|---|
270e1395 JB |
1 | --- avidemux_2.6.10/cmake/admInstallDir.cmake.orig 2015-10-19 20:34:26.862201138 +0200 |
2 | +++ avidemux_2.6.10/cmake/admInstallDir.cmake 2015-10-19 21:15:45.397657233 +0200 | |
3 | @@ -20,6 +20,8 @@ | |
4 | SET(AVIDEMUX_RELATIVE_LIB_DIR lib64) | |
5 | ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib32([; ]|$)") | |
6 | SET(AVIDEMUX_RELATIVE_LIB_DIR lib32) | |
7 | + ELSEIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/libx32([; ]|$)") | |
8 | + SET(AVIDEMUX_RELATIVE_LIB_DIR libx32) | |
9 | ELSE(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)") | |
10 | SET(AVIDEMUX_RELATIVE_LIB_DIR lib) | |
11 | ENDIF(CMAKE_C_IMPLICIT_LINK_DIRECTORIES MATCHES "\\/lib64([; ]|$)") | |
0e001267 JB |
12 | --- avidemux_2.7.0/cmake/admYasm_gcc.cmake.orig 2017-12-24 14:39:56.979737709 +0100 |
13 | +++ avidemux_2.7.0/cmake/admYasm_gcc.cmake 2017-12-25 09:22:40.292301873 +0100 | |
14 | @@ -39,7 +39,11 @@ | |
15 | ||
16 | ||
17 | IF( ADM_CPU_X86_64 ) | |
18 | - SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0") | |
19 | + IF( ADM_CPU_64BIT ) | |
20 | + SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m amd64 -DARCH_X86_64=1 -DARCH_X86_32=0") | |
21 | + ELSE( ADM_CPU_64BIT ) | |
22 | + SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -m x32 -DARCH_X86_64=1 -DARCH_X86_32=0") | |
23 | + ENDIF( ADM_CPU_64BIT ) | |
24 | ELSE( ADM_CPU_X86_64 ) | |
25 | SET(ASM_ARGS_FORMAT "${ASM_ARGS_FORMAT} -DARCH_X86_64=0 -DARCH_X86_32=1") | |
26 | ENDIF( ADM_CPU_X86_64 ) |