change the naming of the object file format define to make it easier to configure...

diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc
index 4d4f0be..174e6a3 100644 (file)
--- a/src/libFLAC/Makefile.vc
+++ b/src/libFLAC/Makefile.vc
@@ -57,11 +57,11 @@ libFLAC.lib: $(OBJS)
        link.exe -lib -out:../../obj/lib/$*.lib $(OBJS)\r
 \r
 ia32/cpu_asm.obj: ia32/cpu_asm.nasm\r
-       $(NASM) -f win32 -d WIN32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj\r
+       $(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj\r
 ia32/fixed_asm.obj: ia32/fixed_asm.nasm\r
-       $(NASM) -f win32 -d WIN32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj\r
+       $(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj\r
 ia32/lpc_asm.obj: ia32/lpc_asm.nasm\r
-       $(NASM) -f win32 -d WIN32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj\r
+       $(NASM) -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj\r
 \r
 clean:\r
        -del *.obj ia32\*.obj *.pch\r

diff --git a/src/libFLAC/ia32/Makefile.am b/src/libFLAC/ia32/Makefile.am
index 0b08d2d..cbbe49f 100644 (file)
--- 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 316955f..0814826 100644 (file)
--- 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