diff options
| author | Josh Blum <josh@joshknows.com> | 2012-07-17 10:29:35 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-07-17 10:29:35 -0700 |
| commit | cf8b2a8ff57ff6d3fd4b78a897854cc9a6f49fe1 (patch) | |
| tree | 4575201b31e1a0e3604e154074391a65767ea1ff /volk/include | |
| parent | 209e98f351f873450c1b2cc0f5bb7877f32e83e4 (diff) | |
volk: fix for win64 MSVC not having MMX support
1) For the machine defs that will pass on windows,
generate a machine with mmx and without using mmx|
2) In the cmakelists, we overrule MMX arch on MSVC 64.
Also overrule redundant machines for when MMX does pass.
3) Set LV_HAVE_SSE && LV_HAVE_MMX for volk_16i_32fc_dot_prod_32fc_a.
Afterall, it is calling into MMX intrinsics as well.
Diffstat (limited to 'volk/include')
| -rw-r--r-- | volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h b/volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h index 940aa5de7c..1f6554af8b 100644 --- a/volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h +++ b/volk/include/volk/volk_16i_32fc_dot_prod_32fc_a.h @@ -37,7 +37,7 @@ static inline void volk_16i_32fc_dot_prod_32fc_a_generic(lv_32fc_t* result, cons #endif /*LV_HAVE_GENERIC*/ -#ifdef LV_HAVE_SSE +#if LV_HAVE_SSE && LV_HAVE_MMX static inline void volk_16i_32fc_dot_prod_32fc_a_sse( lv_32fc_t* result, const short* input, const lv_32fc_t* taps, unsigned int num_points) { @@ -116,7 +116,7 @@ static inline void volk_16i_32fc_dot_prod_32fc_a_sse( lv_32fc_t* result, const *result = *(lv_32fc_t*)(&res[0]); } -#endif /*LV_HAVE_SSE*/ +#endif /*LV_HAVE_SSE && LV_HAVE_MMX*/ #endif /*INCLUDED_volk_16i_32fc_dot_prod_32fc_a_H*/ |