diff --git a/Alc/mixer/hrtf_inc.c b/Alc/mixer/hrtf_inc.cpp similarity index 100% rename from Alc/mixer/hrtf_inc.c rename to Alc/mixer/hrtf_inc.cpp diff --git a/Alc/mixer/mixer_c.c b/Alc/mixer/mixer_c.cpp similarity index 99% rename from Alc/mixer/mixer_c.c rename to Alc/mixer/mixer_c.cpp index dce6daec..06e3ae22 100644 --- a/Alc/mixer/mixer_c.c +++ b/Alc/mixer/mixer_c.cpp @@ -101,7 +101,7 @@ static inline void ApplyCoeffs(ALsizei Offset, ALfloat (*RESTRICT Values)[2], #define MixHrtf MixHrtf_C #define MixHrtfBlend MixHrtfBlend_C #define MixDirectHrtf MixDirectHrtf_C -#include "hrtf_inc.c" +#include "hrtf_inc.cpp" void Mix_C(const ALfloat *data, ALsizei OutChans, ALfloat (*RESTRICT OutBuffer)[BUFFERSIZE], diff --git a/Alc/mixer/mixer_neon.c b/Alc/mixer/mixer_neon.cpp similarity index 99% rename from Alc/mixer/mixer_neon.c rename to Alc/mixer/mixer_neon.cpp index 9bc76987..b1f219e4 100644 --- a/Alc/mixer/mixer_neon.c +++ b/Alc/mixer/mixer_neon.cpp @@ -159,7 +159,7 @@ static inline void ApplyCoeffs(ALsizei Offset, ALfloat (*RESTRICT Values)[2], #define MixHrtf MixHrtf_Neon #define MixHrtfBlend MixHrtfBlend_Neon #define MixDirectHrtf MixDirectHrtf_Neon -#include "hrtf_inc.c" +#include "hrtf_inc.cpp" void Mix_Neon(const ALfloat *data, ALsizei OutChans, ALfloat (*RESTRICT OutBuffer)[BUFFERSIZE], diff --git a/Alc/mixer/mixer_sse.c b/Alc/mixer/mixer_sse.cpp similarity index 99% rename from Alc/mixer/mixer_sse.c rename to Alc/mixer/mixer_sse.cpp index d9ad2ed3..8492a1c8 100644 --- a/Alc/mixer/mixer_sse.c +++ b/Alc/mixer/mixer_sse.cpp @@ -130,7 +130,7 @@ static inline void ApplyCoeffs(ALsizei Offset, ALfloat (*RESTRICT Values)[2], #define MixHrtf MixHrtf_SSE #define MixHrtfBlend MixHrtfBlend_SSE #define MixDirectHrtf MixDirectHrtf_SSE -#include "hrtf_inc.c" +#include "hrtf_inc.cpp" void Mix_SSE(const ALfloat *data, ALsizei OutChans, ALfloat (*RESTRICT OutBuffer)[BUFFERSIZE], diff --git a/Alc/mixer/mixer_sse2.c b/Alc/mixer/mixer_sse2.cpp similarity index 100% rename from Alc/mixer/mixer_sse2.c rename to Alc/mixer/mixer_sse2.cpp diff --git a/Alc/mixer/mixer_sse3.c b/Alc/mixer/mixer_sse3.cpp similarity index 100% rename from Alc/mixer/mixer_sse3.c rename to Alc/mixer/mixer_sse3.cpp diff --git a/Alc/mixer/mixer_sse41.c b/Alc/mixer/mixer_sse41.cpp similarity index 100% rename from Alc/mixer/mixer_sse41.c rename to Alc/mixer/mixer_sse41.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index d4c48fcd..2b3fef2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -831,7 +831,7 @@ SET(ALC_OBJS Alc/polymorphism.h Alc/mixvoice.cpp Alc/mixer/defs.h - Alc/mixer/mixer_c.c + Alc/mixer/mixer_c.cpp ) @@ -865,9 +865,9 @@ IF(HAVE_XMMINTRIN_H) IF(ALSOFT_CPUEXT_SSE) IF(ALIGN_DECL OR HAVE_C11_ALIGNAS) SET(HAVE_SSE 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse.cpp) IF(SSE_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse.c PROPERTIES + SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse.cpp PROPERTIES COMPILE_FLAGS "${SSE_SWITCH}") ENDIF() SET(CPU_EXTS "${CPU_EXTS}, SSE") @@ -885,9 +885,9 @@ IF(HAVE_EMMINTRIN_H) IF(HAVE_SSE AND ALSOFT_CPUEXT_SSE2) IF(ALIGN_DECL OR HAVE_C11_ALIGNAS) SET(HAVE_SSE2 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse2.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse2.cpp) IF(SSE2_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse2.c PROPERTIES + SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse2.cpp PROPERTIES COMPILE_FLAGS "${SSE2_SWITCH}") ENDIF() SET(CPU_EXTS "${CPU_EXTS}, SSE2") @@ -905,9 +905,9 @@ IF(HAVE_EMMINTRIN_H) IF(HAVE_SSE2 AND ALSOFT_CPUEXT_SSE3) IF(ALIGN_DECL OR HAVE_C11_ALIGNAS) SET(HAVE_SSE3 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse3.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse3.cpp) IF(SSE2_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse3.c PROPERTIES + SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse3.cpp PROPERTIES COMPILE_FLAGS "${SSE3_SWITCH}") ENDIF() SET(CPU_EXTS "${CPU_EXTS}, SSE3") @@ -925,9 +925,9 @@ IF(HAVE_SMMINTRIN_H) IF(HAVE_SSE2 AND ALSOFT_CPUEXT_SSE4_1) IF(ALIGN_DECL OR HAVE_C11_ALIGNAS) SET(HAVE_SSE4_1 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse41.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse41.cpp) IF(SSE4_1_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse41.c PROPERTIES + SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse41.cpp PROPERTIES COMPILE_FLAGS "${SSE4_1_SWITCH}") ENDIF() SET(CPU_EXTS "${CPU_EXTS}, SSE4.1") @@ -945,9 +945,9 @@ IF(HAVE_ARM_NEON_H) OPTION(ALSOFT_CPUEXT_NEON "Enable ARM Neon support" ON) IF(ALSOFT_CPUEXT_NEON) SET(HAVE_NEON 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_neon.c) + SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_neon.cpp) IF(FPU_NEON_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_neon.c PROPERTIES + SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_neon.cpp PROPERTIES COMPILE_FLAGS "${FPU_NEON_SWITCH}") ENDIF() SET(CPU_EXTS "${CPU_EXTS}, Neon")