]>
Commit | Line | Data |
---|---|---|
b841a03e JR |
1 | --- x264-snapshot-20140824-2245/configure~ 2015-03-05 18:41:55.000000000 +0000 |
2 | +++ x264-snapshot-20140824-2245/configure 2015-03-05 18:47:39.881867944 +0000 | |
3 | @@ -594,8 +594,8 @@ | |
4 | if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then | |
e3dd7f14 | 5 | CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2" |
b841a03e JR |
6 | fi |
7 | - CFLAGS="-m32 $CFLAGS" | |
8 | - LDFLAGS="-m32 $LDFLAGS" | |
9 | + CFLAGS="$CFLAGS" | |
10 | + LDFLAGS="$LDFLAGS" | |
e3dd7f14 JP |
11 | fi |
12 | if [ "$SYS" = MACOSX ]; then | |
13 | ASFLAGS="$ASFLAGS -f macho32 -DPREFIX" | |
b841a03e | 14 | @@ -627,7 +627,7 @@ |
e3dd7f14 | 15 | AS_EXT=".asm" |
b841a03e | 16 | ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" |
e3dd7f14 | 17 | stack_alignment=16 |
b841a03e JR |
18 | - [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" |
19 | + [ $compiler = GNU ] && CFLAGS="$CFLAGS" && LDFLAGS="$LDFLAGS" | |
20 | if [ "$SYS" = MACOSX ]; then | |
c8ddc010 | 21 | ASFLAGS="$ASFLAGS -f macho64 -DPREFIX" |
b841a03e JR |
22 | if cc_check '' "-arch x86_64"; then |
23 | @@ -641,7 +641,14 @@ | |
e3dd7f14 JP |
24 | RCFLAGS="--target=pe-x86-64 $RCFLAGS" |
25 | fi | |
b841a03e JR |
26 | else |
27 | + case "$host_os" in | |
28 | + *gnux32) | |
e3dd7f14 | 29 | + ASFLAGS="$ASFLAGS -f elfx32" |
b841a03e JR |
30 | + ;; |
31 | + *) | |
e3dd7f14 | 32 | ASFLAGS="$ASFLAGS -f elf64" |
b841a03e JR |
33 | + ;; |
34 | + esac | |
35 | fi | |
36 | ;; | |
e3dd7f14 | 37 | powerpc*) |