Skip to content

Commit

Permalink
fix ios muti arch build in qt5.8
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Mar 23, 2017
1 parent c45c3c0 commit 04e04dd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/utils/CopyFrame_SSE2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
******************************************************************************/
#if defined(__SSE__) || defined(_M_IX86) || defined(_M_X64) // gcc, clang defines __SSE__, vc does not
#ifndef INC_FROM_NAMESPACE
#include <stdint.h> //intptr_t
#include <string.h>
Expand All @@ -39,7 +40,6 @@
//
// COPIES VIDEO FRAMES FROM USWC MEMORY TO WB SYSTEM MEMORY VIA CACHED BUFFER
// ASSUMES PITCH IS A MULTIPLE OF 64B CACHE LINE SIZE, WIDTH MAY NOT BE

#ifndef STREAM_LOAD_SI128
#define STREAM_LOAD_SI128(x) _mm_load_si128(x)
#endif //STREAM_LOAD_SI128
Expand Down Expand Up @@ -238,3 +238,4 @@ void *memcpy_sse2(void* dst, const void* src, size_t size)

return dst;
}
#endif
3 changes: 2 additions & 1 deletion src/utils/CopyFrame_SSE4.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
******************************************************************************/

#if defined(__SSE__) || defined(_M_IX86) || defined(_M_X64) // gcc, clang defines __SSE__, vc does not
// for mingw gcc
#include <smmintrin.h> //stream load
#include <stdint.h> //intptr_t
Expand All @@ -39,3 +39,4 @@ void *memcpy_sse4(void* dst, const void* src, size_t size)
{
return sse4::memcpy_sse2(dst, src, size);
}
#endif

0 comments on commit 04e04dd

Please sign in to comment.