Browse Source

Bug 2535 - Audacity fails to build on 32-bit Linux

au-ny-api
Leland Lucius 2 years ago
parent
commit
90a69a0173
  1. 17
      CMakeLists.txt
  2. 6
      cmake-proxies/libsoxr/CMakeLists.txt
  3. 4
      cmake-proxies/sbsms/CMakeLists.txt

17
CMakeLists.txt

@ -252,32 +252,29 @@ set( CMAKE_LINK_INTERFACE_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} )
test_big_endian( WORDS_BIGENDIAN )
# Check for compiler flags
set( MMX_FLAG "" CACHE INTERNAL "" )
set( SSE_FLAG "" CACHE INTERNAL "" )
if( CMAKE_CXX_COMPILER_ID MATCHES "AppleClang|Clang|GNU" )
check_cxx_compiler_flag( "-mmmx" HAVE_MMX )
if( HAVE_MMX )
if( HAVE_MMX AND NOT IS_64BIT )
set( MMX_FLAG "-mmmx" CACHE INTERNAL "" )
endif()
check_cxx_compiler_flag( "-msse" HAVE_SSE )
if( HAVE_SSE )
if( HAVE_SSE AND NOT IS_64BIT )
set( SSE_FLAG "-msse" CACHE INTERNAL "" )
endif()
check_cxx_compiler_flag( "-msse2" HAVE_SSE2 )
if( HAVE_SSE2 )
if( HAVE_SSE2 AND NOT IS_64BIT )
set( SSE_FLAG "-msse2" CACHE INTERNAL "" )
endif()
elseif( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
set( HAVE_MMX ON )
set( HAVE_SSE ON )
set( HAVE_SSE2 ON )
set( MMX_FLAG "" )
if( IS_64BIT )
set( SSE_FLAG "" )
set( SSE2_FLAG "" )
else()
set( SSE_FLAG "/arch:SSE" )
set( SSE2_FLAG "/arch:SSE2" )
if( NOT IS_64BIT )
set( SSE_FLAG "/arch:SSE2" )
endif()
endif()

6
cmake-proxies/libsoxr/CMakeLists.txt

@ -11,7 +11,6 @@ list( APPEND SOURCES
${TARGET_ROOT}/src/cr32.c
${TARGET_ROOT}/src/cr32s.c
${TARGET_ROOT}/src/cr64.c
# ${TARGET_ROOT}/src/cr64s.c
${TARGET_ROOT}/src/data-io.c
${TARGET_ROOT}/src/dbesi0.c
${TARGET_ROOT}/src/fft4g.c
@ -19,10 +18,8 @@ list( APPEND SOURCES
${TARGET_ROOT}/src/fft4g64.c
${TARGET_ROOT}/src/filter.c
${TARGET_ROOT}/src/pffft32s.c
# ${TARGET_ROOT}/src/pffft64s.c
${TARGET_ROOT}/src/soxr.c
${TARGET_ROOT}/src/util32s.c
# ${TARGET_ROOT}/src/util64s.c
${TARGET_ROOT}/src/vr32.c
)
@ -72,7 +69,8 @@ set( WITH_VR32 YES )
find_package( SIMD32 )
if( SIMD32_FOUND )
set( WITH_CR32S YES )
string( STRIP ${SIMD32_C_FLAGS} SIMD32_C_FLAGS )
string( STRIP "${SIMD32_C_FLAGS}" SIMD32_C_FLAGS )
string( REPLACE " " ";" SIMD32_C_FLAGS "${SIMD32_C_FLAGS}" )
list( APPEND OPTIONS ${SIMD32_C_FLAGS} )
endif()

4
cmake-proxies/sbsms/CMakeLists.txt

@ -29,9 +29,7 @@ list( APPEND OPTIONS
PRIVATE
$<$<C_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-enum-compare>
${MMX_FLAG}
# Bug 2488 - Do not define this for SBSMS
# ${SSE_FLAG}
${SSE_FLAG}
)
find_package( Threads )

Loading…
Cancel
Save