diff --git a/libfreerdp/primitives/test/CMakeLists.txt b/libfreerdp/primitives/test/CMakeLists.txt index 738329152..6d6898f17 100644 --- a/libfreerdp/primitives/test/CMakeLists.txt +++ b/libfreerdp/primitives/test/CMakeLists.txt @@ -31,11 +31,28 @@ set(PRIMITIVE_TEST_CFILES test_set.c test_shift.c test_sign.c + ../prim_add.c + ../prim_andor.c + ../prim_alphaComp.c + ../prim_colors.c + ../prim_copy.c + ../prim_set.c + ../prim_shift.c + ../prim_sign.c + ../prim_add_opt.c + ../prim_alphaComp_opt.c + ../prim_andor_opt.c + ../prim_colors_opt.c + ../prim_set_opt.c + ../prim_shift_opt.c + ../prim_sign_opt.c + ../primitives.c ) set(PRIMITIVE_TEST_HEADERS measure.h prim_test.h + ../prim_internal.h ) set(PRIMITIVE_TEST_SRCS @@ -121,7 +138,7 @@ endif() set_property(SOURCE ${PRIMITIVE_TEST_CFILES} PROPERTY COMPILE_FLAGS ${OPTFLAGS}) -target_link_libraries(prim_test freerdp-primitives rt winpr-sysinfo) +target_link_libraries(prim_test rt winpr-sysinfo) if(NOT TESTING_OUTPUT_DIRECTORY) set(TESTING_OUTPUT_DIRECTORY .) endif() diff --git a/libfreerdp/primitives/test/prim_test.c b/libfreerdp/primitives/test/prim_test.c index 7e88efbc9..5104eebc7 100644 --- a/libfreerdp/primitives/test/prim_test.c +++ b/libfreerdp/primitives/test/prim_test.c @@ -44,8 +44,8 @@ typedef struct } flagpair_t; static const flagpair_t flags[] = -#ifdef _M_IX86_AMD64 { +#ifdef _M_IX86_AMD64 { PF_MMX_INSTRUCTIONS_AVAILABLE, "MMX" }, { PF_3DNOW_INSTRUCTIONS_AVAILABLE, "3DNow" }, { PF_XMMI_INSTRUCTIONS_AVAILABLE, "SSE" }, diff --git a/libfreerdp/primitives/test/prim_test.h b/libfreerdp/primitives/test/prim_test.h index fa61025f0..f32f46889 100644 --- a/libfreerdp/primitives/test/prim_test.h +++ b/libfreerdp/primitives/test/prim_test.h @@ -101,7 +101,7 @@ extern int test_or_32u_speed(void); /* Since so much of this code is repeated, define a macro to build * functions to do speed tests. */ -#ifdef armel +#ifdef _M_ARM #define SIMD_TYPE "Neon" #else #define SIMD_TYPE "SSE" @@ -122,7 +122,7 @@ extern int test_or_32u_speed(void); } \ } while (0) -#if (defined(_M_IX86_AMD64) && defined(WITH_SSE2)) || (defined(arm) && defined(WITH_NEON)) +#if (defined(_M_IX86_AMD64) && defined(WITH_SSE2)) || (defined(_M_ARM) && defined(WITH_NEON)) #define DO_OPT_MEASUREMENTS(_funcOpt_, _prework_) \ do { \ for (s=0; s