diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-06-14 06:27:24 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-06-14 06:31:25 +1000 |
| commit | e58b36c8ea4d45b6e3d4fb5e5df747e5f8b6c9d2 (patch) | |
| tree | fba017dec0d8f62ae1383b1add660d838c76308e | |
| parent | fdc1ccf2bd2ea52b3fab2c71a0d106a81e2c72e9 (diff) | |
| download | flac-e58b36c8ea4d45b6e3d4fb5e5df747e5f8b6c9d2.tar.gz | |
Fix nasm compile on OS X / Darwin
Apparently this had been fixes in Audacity and other projects
but no one had bothered to feed them back upstream. Thanks to
lvqcl for researching this and finding the relevant patches.
Thanks to Ozkan Sezer for validating them.
Closes: https://sourceforge.net/p/flac/bugs/438/
| -rw-r--r-- | src/libFLAC/ia32/nasm.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libFLAC/ia32/nasm.h b/src/libFLAC/ia32/nasm.h index efa68081..aac9194f 100644 --- a/src/libFLAC/ia32/nasm.h +++ b/src/libFLAC/ia32/nasm.h @@ -46,12 +46,17 @@ %idefine code_section section .text %idefine data_section section .data %idefine bss_section section .bss +%elifdef OBJ_FORMAT_macho + %define FLAC__PUBLIC_NEEDS_UNDERSCORE + %idefine code_section section .text + %idefine data_section section .data + %idefine bss_section section .bss %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 %else - %error unsupported object format! + %error unsupported object format! ; this directive doesn't really work here %endif %imacro cglobal 1 |