diff --git a/Build-OSX.md b/Build-OSX.md index 00afa50..0fb39d2 100644 --- a/Build-OSX.md +++ b/Build-OSX.md @@ -4,18 +4,18 @@ You need to have XCode and macports / homebrew installed. -### Install dependencies fftw-3 and liquid-dsp +### Install liquid-dsp You can use MacPorts or Brew for this part. ##### MacPorts: ``` -ccliffe$ sudo port install fftw-3-single liquid-dsp cmake +ccliffe$ sudo port install liquid-dsp cmake .. installing .. ``` ##### Homebrew: ``` -ccliffe$ brew install fftw automake cmake +ccliffe$ brew install automake cmake .. installing .. ccliffe$ git clone https://github.com/jgaeddert/liquid-dsp.git ccliffe$ cd liquid-dsp @@ -36,13 +36,13 @@ Substitute your own user paths where appropriate. ccliffe$ mkdir ~/Dev ccliffe$ cd ~/Dev Dev$ mkdir wxWidgets-build -Dev$ wget -O wxWidgets-3.0.2.tar.bz2 http://sourceforge.net/projects/wxwindows/files/3.0.2/wxWidgets-3.0.2.tar.bz2/download -Dev$ tar -xvjpf wxWidgets-3.0.2.tar.bz2 +Dev$ wget -O wxWidgets-3.1.0.tar.bz2 wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.0/wxWidgets-3.1.0.tar.bz2 +Dev$ tar -xvjpf wxWidgets-3.1.0.tar.bz2 ... unpacking ... -Dev$ cd wxWidgets-3.0.2 -wxWidgets-3.0.2$ ./configure --with-opengl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --with-mac --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --with-macosx-version-min=10.9 --prefix=/Users//Dev/wxWidgets-build CXXFLAGS="-std=c++0x" --with-libiconv=/usr +Dev$ cd wxWidgets-3.1.0 +wxWidgets-3.1.0$ ./configure --with-opengl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --with-mac --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --with-macosx-version-min=10.9 --prefix=/Users/(YOUR_USERNAME)/Dev/wxWidgets-build CXXFLAGS="-std=c++0x" --with-libiconv=/usr ... configuring ... -wxWidgets-3.0.2$ make -j4 && make install +wxWidgets-3.1.0$ make -j4 && make install ... building, installing ... ``` @@ -66,7 +66,7 @@ ccliffe$ git clone https://github.com/cjcliffe/CubicSDR.git ccliffe$ cd CubicSDR ccliffe$ mkdir build ccliffe$ cd build -build$ cmake ../ -DwxWidgets_CONFIG_EXECUTABLE=/Users//wxWidgets/wxWidgets-staticlib/bin/wx-config -DCMAKE_BUILD_TYPE=Release -DBUNDLE_APP=1 -DCPACK_BINARY_DRAGNDROP=1 +build$ cmake ../ -DwxWidgets_CONFIG_EXECUTABLE=/Users/(YOUR_USERNAME)/wxWidgets/wxWidgets-staticlib/bin/wx-config -DCMAKE_BUILD_TYPE=Release -DBUNDLE_APP=1 -DCPACK_BINARY_DRAGNDROP=1 ... generating ... -- Build files have been written to: .../CubicSDR/build build$ cpack