diff --git a/cmake/BuildSamplerate.cmake b/cmake/BuildSamplerate.cmake index 4b8073fc..dd369231 100644 --- a/cmake/BuildSamplerate.cmake +++ b/cmake/BuildSamplerate.cmake @@ -4,7 +4,11 @@ set(PATCH_COMMAND patch -p0 < ${CMAKE_BINARY_DIR}/../patch-samplerate.diff) if(MINGW AND CMAKE_CROSSCOMPILING) set(CONFIGURE_COMMAND ./configure --host=${HOST} --target=${HOST} --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-sndfile --disable-fftw) elseif(APPLE) +if(BUILD_OSX_UNIVERSAL) set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist CFLAGS=-g\ -O2\ -mmacosx-version-min=10.9\ -arch\ arm64\ -arch\ x86_64) +else() + set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist CFLAGS=-g\ -O2\ -mmacosx-version-min=10.9) +endif(BUILD_OSX_UNIVERSAL) else() set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist) endif() diff --git a/cmake/BuildSndfile.cmake b/cmake/BuildSndfile.cmake index 351f300d..827989e4 100644 --- a/cmake/BuildSndfile.cmake +++ b/cmake/BuildSndfile.cmake @@ -3,7 +3,11 @@ set(SNDFILE_TARBALL "libsndfile-1.0.28") if(MINGW AND CMAKE_CROSSCOMPILING) set(CONFIGURE_COMMAND ./configure --host=${HOST} --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-external-libs --disable-shared --disable-sqlite) elseif(APPLE) +if(BUILD_OSX_UNIVERSAL) set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-shared --disable-external-libs CFLAGS=-g\ -O2\ -mmacosx-version-min=10.9\ -arch\ x86_64\ -arch\ arm64 LDFLAGS=-arch\ x86_64\ -arch\ arm64) +else() + set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-shared --disable-external-libs CFLAGS=-g\ -O2\ -mmacosx-version-min=10.9) +endif(BUILD_OSX_UNIVERSAL) else() set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-external-libs --disable-shared --disable-external-libs) endif() diff --git a/cmake/BuildSpeex.cmake b/cmake/BuildSpeex.cmake index ec687ece..8f6dead8 100644 --- a/cmake/BuildSpeex.cmake +++ b/cmake/BuildSpeex.cmake @@ -4,7 +4,11 @@ if(MINGW AND CMAKE_CROSSCOMPILING) include(cmake/MinGW.cmake) set(CONFIGURE_COMMAND ./configure --host=${HOST} --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-examples) elseif(APPLE) +if(BUILD_OSX_UNIVERSAL) + set(CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/../configure_speexdsp_osx_universal.sh ${CMAKE_BINARY_DIR}/external/dist) +else() set(CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/../configure_speexdsp_osx.sh ${CMAKE_BINARY_DIR}/external/dist) +endif(BUILD_OSX_UNIVERSAL) else() set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-examples) endif() diff --git a/configure_speexdsp_osx.sh b/configure_speexdsp_osx.sh index a35631dd..4b73885b 100755 --- a/configure_speexdsp_osx.sh +++ b/configure_speexdsp_osx.sh @@ -1,3 +1,3 @@ #!/bin/bash -CFLAGS="-g -O2 -arch arm64 -arch x86_64 -mmacosx-version-min=10.9" ./configure --prefix=$1 --disable-examples +CFLAGS="-g -O2 -mmacosx-version-min=10.9" ./configure --prefix=$1 --disable-examples diff --git a/configure_speexdsp_osx_universal.sh b/configure_speexdsp_osx_universal.sh new file mode 100755 index 00000000..a35631dd --- /dev/null +++ b/configure_speexdsp_osx_universal.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +CFLAGS="-g -O2 -arch arm64 -arch x86_64 -mmacosx-version-min=10.9" ./configure --prefix=$1 --disable-examples