aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2018-03-22 05:06:15 -0700
committerChris Robinson <[email protected]>2018-03-22 05:06:15 -0700
commit091e676db34ff51a709427d5b1203bfcd0788fb4 (patch)
tree6d67621e71b1290cdf3241a949f45f0e9915ab0e /CMakeLists.txt
parent6ad171781a8e2270f598263149356385cc06d8f9 (diff)
Move mixer sources into a sub-directory
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt24
1 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 986a6c32..646a437c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -735,8 +735,8 @@ SET(ALC_OBJS Alc/ALc.c
Alc/bformatdec.c
Alc/nfcfilter.c
Alc/panning.c
- Alc/mixer.c
- Alc/mixer_c.c
+ Alc/mixvoice.c
+ Alc/mixer/mixer_c.c
)
@@ -770,9 +770,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_sse.c)
+ SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse.c)
IF(SSE_SWITCH)
- SET_SOURCE_FILES_PROPERTIES(Alc/mixer_sse.c PROPERTIES
+ SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse.c PROPERTIES
COMPILE_FLAGS "${SSE_SWITCH}")
ENDIF()
SET(CPU_EXTS "${CPU_EXTS}, SSE")
@@ -790,9 +790,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_sse2.c)
+ SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse2.c)
IF(SSE2_SWITCH)
- SET_SOURCE_FILES_PROPERTIES(Alc/mixer_sse2.c PROPERTIES
+ SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse2.c PROPERTIES
COMPILE_FLAGS "${SSE2_SWITCH}")
ENDIF()
SET(CPU_EXTS "${CPU_EXTS}, SSE2")
@@ -810,9 +810,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_sse3.c)
+ SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse3.c)
IF(SSE2_SWITCH)
- SET_SOURCE_FILES_PROPERTIES(Alc/mixer_sse3.c PROPERTIES
+ SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse3.c PROPERTIES
COMPILE_FLAGS "${SSE3_SWITCH}")
ENDIF()
SET(CPU_EXTS "${CPU_EXTS}, SSE3")
@@ -830,9 +830,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_sse41.c)
+ SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_sse41.c)
IF(SSE4_1_SWITCH)
- SET_SOURCE_FILES_PROPERTIES(Alc/mixer_sse41.c PROPERTIES
+ SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_sse41.c PROPERTIES
COMPILE_FLAGS "${SSE4_1_SWITCH}")
ENDIF()
SET(CPU_EXTS "${CPU_EXTS}, SSE4.1")
@@ -850,9 +850,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_neon.c)
+ SET(ALC_OBJS ${ALC_OBJS} Alc/mixer/mixer_neon.c)
IF(FPU_NEON_SWITCH)
- SET_SOURCE_FILES_PROPERTIES(Alc/mixer_neon.c PROPERTIES
+ SET_SOURCE_FILES_PROPERTIES(Alc/mixer/mixer_neon.c PROPERTIES
COMPILE_FLAGS "${FPU_NEON_SWITCH}")
ENDIF()
SET(CPU_EXTS "${CPU_EXTS}, Neon")