gate i386 code with FLAC__HAS_NASM

diff --git a/src/libFLAC/encoder.c b/src/libFLAC/encoder.c
index a1470ce..9025d0e 100644 (file)
--- a/src/libFLAC/encoder.c
+++ b/src/libFLAC/encoder.c
@@ -329,6 +329,7 @@ FLAC__EncoderState FLAC__encoder_init(FLAC__Encoder *encoder, FLAC__EncoderWrite
        if(encoder->guts->cpuinfo.use_asm) {
 #ifdef FLAC__CPU_IA32
                assert(encoder->guts->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
+#ifdef FLAC__HAS_NASM
 #if 0
                /* @@@ SSE version not working yet */
                if(encoder->guts->cpuinfo.data.ia32.sse)
@@ -342,6 +343,7 @@ fprintf(stderr,"@@@ got _asm_i386 of lpc_compute_autocorrelation()\n");
                        encoder->guts->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov;
 fprintf(stderr,"@@@ got _asm_i386_mmx_cmov of fixed_compute_best_predictor()\n");}
 #endif
+#endif
        }
 
        if(encoder->bits_per_sample + FLAC__bitmath_ilog2(encoder->blocksize)+1 > 30)

diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index e729e09..f365c63 100644 (file)
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -170,6 +170,7 @@ FLAC__StreamDecoderState FLAC__stream_decoder_init(
        if(decoder->guts->cpuinfo.use_asm) {
 #ifdef FLAC__CPU_IA32
                assert(decoder->guts->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
+#ifdef FLAC__HAS_NASM
 #if 0
                /* @@@ MMX version needs bps check */
                if(decoder->guts->cpuinfo.data.ia32.mmx && @@@bps check here@@@)
@@ -179,6 +180,7 @@ FLAC__StreamDecoderState FLAC__stream_decoder_init(
 fprintf(stderr,"@@@ got _asm_i386 of lpc_restore_signal()\n");
                        decoder->guts->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_i386;
 #endif
+#endif
        }
 
        return decoder->state;