Commit 17683d75 authored by Sam Hocevar's avatar Sam Hocevar
Browse files

* configure common/i386/i386inc.asm: got rid of -DFORMAT_* nasm flags

    and use built-in preprocessor tests instead.


git-svn-id: svn://svn.videolan.org/x264/trunk@448 df754926-b1dd-0310-bc7b-ec298dee348c
parent 3723deea
......@@ -66,7 +66,7 @@ BITS 32
; mov eax, [esp + 12]
;
%ifdef __PIC__
%ifdef FORMAT_MACHO
%ifidn __OUTPUT_FORMAT__,macho
; There is no real global offset table on OS X, but we still
; need to reference our variables by offset.
%define GLOBAL + ebx
......@@ -77,7 +77,7 @@ BITS 32
sub %1, %%getgot
%endmacro
%else
%ifdef FORMAT_ELF
%ifidn __OUTPUT_FORMAT__,elf
%define GOT _GLOBAL_OFFSET_TABLE_
%else ; for a.out
%define GOT __GLOBAL_OFFSET_TABLE_
......
......@@ -58,7 +58,7 @@ LDFLAGS=""
HAVE_GETOPT_LONG=1
AS="nasm"
ASFLAGS="-f elf -DFORMAT_ELF"
ASFLAGS="-f elf"
EXE=""
......@@ -120,10 +120,10 @@ case "$UNAMEM" in
ARCH="X86"
CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
if [ "$SYS" = MACOSX ]; then
ASFLAGS="-f macho -DPREFIX -DFORMAT_MACHO"
ASFLAGS="-f macho -DPREFIX"
fi
if [ "$SYS" = FREEBSD -o "$SYS" = NETBSD ]; then
ASFLAGS="-f aoutb -DFORMAT_AOUTB"
ASFLAGS="-f aoutb"
fi
;;
x86_64)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment