diff --git a/README.md b/README.md index 426053b..157c57a 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,21 @@ It also requires a modern C++17 compiler (GCC 8 minimum). make test sudo make install +## Build Steps for local building under Anaconda for Windows + +### Prequisites +- Microsoft Visual Studio 2019 +- Miniconda (or Anaconda) x64 for Windows + +### From a clean Conda environment + ``` + conda config --add channels conda-forge + conda create -n M17 vs2019_win-64 cmake ninja pkg-config boost-cpp gtest gmock gtest libcodec2 + conda activate M17 + ``` + +### From the top level of the m17-cxx-demod repo, execute win_build.bat + ## Running This program was designed to be used with RTL-SDR, specifically rtl-fm. diff --git a/windows_conda_build.bat b/win_build.bat similarity index 85% rename from windows_conda_build.bat rename to win_build.bat index 8da0df7..3346e2b 100644 --- a/windows_conda_build.bat +++ b/win_build.bat @@ -1,3 +1,10 @@ +:: +:: win_build.bat +:: +:: Batch file to locally build under Windows using Conda +:: +:: See README.md for details +:: setlocal EnableDelayedExpansion @echo on diff --git a/windows_conda_build.md b/windows_conda_build.md deleted file mode 100644 index fc187db..0000000 --- a/windows_conda_build.md +++ /dev/null @@ -1,17 +0,0 @@ -These are the steps used to locally build under Anaconda for Windows - -- Installed VS 2019 Community Edition -- Installed Miniconda x64 for Windows -- Forked and locally cloned the original m17-cxx-demod repo -- Manually applied patches 0001, 0002, 0004 through 0010 -- In a fresh Miniconda... - conda config --add channels conda-forge - conda create -n M17 vs2019_win-64 cmake ninja pkg-config boost-cpp gtest gmock gtest libcodec2 - conda activate M17 -- Copied https://github.com/conda-forge/m17-cxx-demod-feedstock/blob/master/recipe/bld.bat into my repo branch -- Modified the bld.bat - changed the exit 1 commands to exit /B 1 (so the command shell stayed open) - added set CPU_COUNT=3 -- renamed bld.bat to windows_conda_build.bat -- Executed batch file - and it works! tests passed, and can run the apps -