Skip to content

Commit

Permalink
let's test on windows again
Browse files Browse the repository at this point in the history
  • Loading branch information
aous72 committed Oct 15, 2019
1 parent bd0098d commit 532ffb1
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 8 deletions.
Binary file not shown.
2 changes: 2 additions & 0 deletions src/core/common/ojph_arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ namespace ojph {
int cpu_ext_level();

/////////////////////////////////////////////////////////////////////////////
#ifdef OJPH_COMPILER_MSVC
#include <intrin.h>
#endif

/////////////////////////////////////////////////////////////////////////////
static inline ui32 population_count(ui32 val)
Expand Down
7 changes: 6 additions & 1 deletion src/core/transform/ojph_colour_avx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,18 @@
/****************************************************************************/

#include <cmath>
#include <intrin.h>

#include "ojph_defs.h"
#include "ojph_arch.h"
#include "ojph_colour.h"
#include "ojph_colour_local.h"

#ifdef OJPH_COMPILER_MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#endif

namespace ojph {
namespace local {

Expand Down
7 changes: 6 additions & 1 deletion src/core/transform/ojph_colour_avx2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,16 @@
/****************************************************************************/

#include <cmath>
#include <intrin.h>

#include "ojph_defs.h"
#include "ojph_colour.h"

#ifdef OJPH_COMPILER_MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#endif

namespace ojph {
namespace local {

Expand Down
7 changes: 6 additions & 1 deletion src/core/transform/ojph_colour_sse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,17 @@
/****************************************************************************/

#include <cmath>
#include <intrin.h>

#include "ojph_defs.h"
#include "ojph_colour.h"
#include "ojph_colour_local.h"

#ifdef OJPH_COMPILER_MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#endif

namespace ojph {
namespace local {

Expand Down
6 changes: 5 additions & 1 deletion src/core/transform/ojph_colour_sse2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,15 @@
/****************************************************************************/

#include <cmath>
#include <intrin.h>

#include "ojph_defs.h"
#include "ojph_colour.h"

#ifdef OJPH_COMPILER_MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#endif

namespace ojph {
namespace local {
Expand Down
7 changes: 6 additions & 1 deletion src/core/transform/ojph_transform_avx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,16 @@
/****************************************************************************/

#include <cstdio>
#include <intrin.h>

#include "ojph_transform.h"
#include "ojph_transform_local.h"

#ifdef OJPH_COMPILER_MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#endif

namespace ojph {
namespace local {

Expand Down
7 changes: 6 additions & 1 deletion src/core/transform/ojph_transform_avx2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,16 @@
/****************************************************************************/

#include <cstdio>
#include <intrin.h>

#include "ojph_transform.h"
#include "ojph_transform_local.h"

#ifdef OJPH_COMPILER_MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#endif

namespace ojph {
namespace local {

Expand Down
6 changes: 5 additions & 1 deletion src/core/transform/ojph_transform_sse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,15 @@
/****************************************************************************/

#include <cstdio>
#include <intrin.h>

#include "ojph_transform.h"
#include "ojph_transform_local.h"

#ifdef OJPH_COMPILER_MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#endif

namespace ojph {
namespace local {
Expand Down
7 changes: 6 additions & 1 deletion src/core/transform/ojph_transform_sse2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,16 @@
/****************************************************************************/

#include <cstdio>
#include <intrin.h>

#include "ojph_transform.h"
#include "ojph_transform_local.h"

#ifdef OJPH_COMPILER_MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#endif

namespace ojph {
namespace local {

Expand Down

0 comments on commit 532ffb1

Please sign in to comment.