diff --git a/CMakeLists.txt b/CMakeLists.txt index b628fab5..f0944392 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -288,7 +288,7 @@ endif(CODEC2_BUILD_DIR) # if(NOT USE_STATIC_PORTAUDIO) message(STATUS "Looking for portaudio...") - find_package(Portaudio REQUIRED) + find_package(portaudio REQUIRED) if(PORTAUDIO_FOUND) message(STATUS " portaudio library: ${PORTAUDIO_LIBRARIES}") message(STATUS " portaudio headers: ${PORTAUDIO_INCLUDE_DIRS}") diff --git a/README.osx b/README.osx index 43aa2532..a466a088 100644 --- a/README.osx +++ b/README.osx @@ -6,7 +6,7 @@ For the following instructions, I'm assuming you will be placing everything in: 1/ DEPENDENCIES Using MacPorts, most of the appropriate dependencies can be installed by: -$ sudo port install subversion git libtool libsamplerate +universal sox +universal cmake +$ sudo port install subversion git libtool libsamplerate +universal sox +universal cmake portaudio +universal It should be fairly similar using HomeBrew, but you will need to replace all the /opt/ paths in the following instructions. diff --git a/build_osx.sh b/build_osx.sh index 2d251402..c60114ff 100755 --- a/build_osx.sh +++ b/build_osx.sh @@ -51,10 +51,10 @@ export LD_LIBRARY_PATH=$LPCNETDIR/build_osx/src # Finally, build freedv-gui cd $FREEDVGUIDIR && git pull mkdir -p build_osx && cd build_osx && rm -Rf * -cmake -DBUILD_OSX_UNIVERSAL=1 -DCMAKE_BUILD_TYPE=Debug -DBOOTSTRAP_WXWIDGETS=1 -DUSE_STATIC_DEPS=1 -DUSE_STATIC_SPEEXDSP=1 -DHAMLIB_INCLUDE_DIR=${HAMLIBDIR}/include -DHAMLIB_LIBRARY=${HAMLIBDIR}/lib/libhamlib.a -DCODEC2_BUILD_DIR=$CODEC2DIR/build_osx -DLPCNET_BUILD_DIR=$LPCNETDIR/build_osx -DUSE_STATIC_PORTAUDIO=1 .. +cmake -DBUILD_OSX_UNIVERSAL=1 -DCMAKE_BUILD_TYPE=Debug -DBOOTSTRAP_WXWIDGETS=1 -DUSE_STATIC_SPEEXDSP=1 -DHAMLIB_INCLUDE_DIR=${HAMLIBDIR}/include -DHAMLIB_LIBRARY=${HAMLIBDIR}/lib/libhamlib.a -DCODEC2_BUILD_DIR=$CODEC2DIR/build_osx -DLPCNET_BUILD_DIR=$LPCNETDIR/build_osx .. make VERBOSE=1 # Rebuild now that wxWidgets is bootstrapped -cmake -DBUILD_OSX_UNIVERSAL=1 -DCMAKE_BUILD_TYPE=Debug -DBOOTSTRAP_WXWIDGETS=1 -DUSE_STATIC_DEPS=1 -DUSE_STATIC_SPEEXDSP=1 -DHAMLIB_INCLUDE_DIR=${HAMLIBDIR}/include -DHAMLIB_LIBRARY=${HAMLIBDIR}/lib/libhamlib.a -DCODEC2_BUILD_DIR=$CODEC2DIR/build_osx -DLPCNET_BUILD_DIR=$LPCNETDIR/build_osx -DUSE_STATIC_PORTAUDIO=1 .. +cmake -DBUILD_OSX_UNIVERSAL=1 -DCMAKE_BUILD_TYPE=Debug -DBOOTSTRAP_WXWIDGETS=1 -DUSE_STATIC_SPEEXDSP=1 -DHAMLIB_INCLUDE_DIR=${HAMLIBDIR}/include -DHAMLIB_LIBRARY=${HAMLIBDIR}/lib/libhamlib.a -DCODEC2_BUILD_DIR=$CODEC2DIR/build_osx -DLPCNET_BUILD_DIR=$LPCNETDIR/build_osx .. make VERBOSE=1