diff options
Diffstat (limited to 'src/libFLAC/ia32')
| -rw-r--r-- | src/libFLAC/ia32/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libFLAC/ia32/nasm.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libFLAC/ia32/Makefile.am b/src/libFLAC/ia32/Makefile.am index 0b08d2d9..cbbe49fd 100644 --- a/src/libFLAC/ia32/Makefile.am +++ b/src/libFLAC/ia32/Makefile.am @@ -19,7 +19,7 @@ # nasm build rule: SUFFIXES = .nasm .lo .nasm.lo: - $(NASM) -f elf -d ELF $< -o $@ + $(NASM) -f elf -d OBJ_FORMAT_elf $< -o $@ noinst_LTLIBRARIES = libFLAC-asm.la libFLAC_asm_la_SOURCES = \ diff --git a/src/libFLAC/ia32/nasm.h b/src/libFLAC/ia32/nasm.h index 316955fb..0814826b 100644 --- a/src/libFLAC/ia32/nasm.h +++ b/src/libFLAC/ia32/nasm.h @@ -18,17 +18,17 @@ bits 32 -%ifdef WIN32 +%ifdef OBJ_FORMAT_win32 %define FLAC__PUBLIC_NEEDS_UNDERSCORE %idefine code_section section .text align=16 class=CODE use32 %idefine data_section section .data align=32 class=DATA use32 %idefine bss_section section .bss align=32 class=DATA use32 -%elifdef AOUT +%elifdef OBJ_FORMAT_aout %define FLAC__PUBLIC_NEEDS_UNDERSCORE %idefine code_section section .text %idefine data_section section .data %idefine bss_section section .bss -%elifdef ELF +%elifdef OBJ_FORMAT_elf %idefine code_section section .text align=16 %idefine data_section section .data align=32 %idefine bss_section section .bss align=32 |