From da9528576a81825b1d37eac8e2d11c35ed893f33 Mon Sep 17 00:00:00 2001 From: Alejandro Sior Date: Sat, 24 Oct 2020 17:09:25 +0200 Subject: [PATCH 1/3] fixed openbsd build 3 --- CMakeLists.txt | 5 +++++ core/CMakeLists.txt | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfaa8241..565687f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,11 @@ if (MSVC) add_custom_target(do_always_volk ALL xcopy /s \"C:/Program Files/PothosSDR/bin\\volk.dll\" \"$\" /Y) endif (MSVC) + +if (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") + add_custom_target(do_always ALL cp \"$/sdrpp_core.so\" \"$\") +endif () + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") add_custom_target(do_always ALL cp \"$/sdrpp_core.so\" \"$\") endif () diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 9c2a842f..a3400a9f 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -15,7 +15,6 @@ file(GLOB_RECURSE SRC "src/*.cpp" "src/*.c") # Add code to dyn lib add_library(sdrpp_core SHARED ${SRC}) -set_target_properties(sdrpp_core PROPERTIES PREFIX "") # Include core headers target_include_directories(sdrpp_core PUBLIC "src/") From ba81f2593304a9aed70e32948d12c38c91d9ec3a Mon Sep 17 00:00:00 2001 From: Alejandro Sior Date: Sat, 24 Oct 2020 17:18:54 +0200 Subject: [PATCH 2/3] Added OpenBSD build instructions --- readme.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index ce590be6..9413f663 100644 --- a/readme.md +++ b/readme.md @@ -63,14 +63,15 @@ comming soon :) # Building on OSX ## Install requirements + ``` brew tap pothosware/homebrew-pothos brew install volk glew glfw fftw portaudio brew install soapysdr ``` You can install additional soapy device support based on your hardware. - ## The build + ``` mkdir build cd build @@ -78,6 +79,22 @@ cmake .. cmake --build . --config Release ``` +# Building on OpenBSD +## Install requirements + +``` +pkg_add fftw3-float glew glfw portaudio-svn + +# install volk and SoapySDR manually +``` +## The build +``` +mkdir build +cd build +cmake --clang .. +cmake --build . --config Release +``` + # Contributing Feel free to issue pull request and report bugs via the github issues. @@ -101,4 +118,4 @@ I will soon publish a contributing.md listing the code style to use. * [Dear ImGui (ocornut)](https://github.com/ocornut/imgui) * [spdlog (gabime)](https://github.com/gabime/spdlog) * [json (nlohmann)](https://github.com/nlohmann/json) -* [portaudio (PortAudio community)](http://www.portaudio.com/) \ No newline at end of file +* [portaudio (PortAudio community)](http://www.portaudio.com/) From 922a22602874a66358d6c932a5900e242ef33f14 Mon Sep 17 00:00:00 2001 From: Alejandro Sior Date: Sat, 24 Oct 2020 17:34:18 +0200 Subject: [PATCH 3/3] fixed OpenBSD build 4 --- CMakeLists.txt | 6 +++--- prepare_root.sh | 2 +- readme.md | 13 +++++++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 565687f3..624b04a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,15 +27,15 @@ endif (MSVC) if (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") - add_custom_target(do_always ALL cp \"$/sdrpp_core.so\" \"$\") + add_custom_target(do_always ALL cp \"$/libsdrpp_core.so\" \"$\") endif () if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - add_custom_target(do_always ALL cp \"$/sdrpp_core.so\" \"$\") + add_custom_target(do_always ALL cp \"$/libsdrpp_core.so\" \"$\") endif () if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - add_custom_target(do_always ALL cp \"$/sdrpp_core.dylib\" \"$\") + add_custom_target(do_always ALL cp \"$/libsdrpp_core.dylib\" \"$\") endif () # cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/Users/Alex/vcpkg/scripts/buildsystems/vcpkg.cmake" -G "Visual Studio 15 2017 Win64" diff --git a/prepare_root.sh b/prepare_root.sh index bfe77fb0..25212ac1 100755 --- a/prepare_root.sh +++ b/prepare_root.sh @@ -1,3 +1,3 @@ #!/bin/sh -cp build/modules/*/*.so root/modules +cp build/*/*.so root/modules diff --git a/readme.md b/readme.md index 9413f663..a320a238 100644 --- a/readme.md +++ b/readme.md @@ -63,15 +63,14 @@ comming soon :) # Building on OSX ## Install requirements - ``` brew tap pothosware/homebrew-pothos brew install volk glew glfw fftw portaudio brew install soapysdr ``` You can install additional soapy device support based on your hardware. -## The build +## The build ``` mkdir build cd build @@ -81,20 +80,26 @@ cmake --build . --config Release # Building on OpenBSD ## Install requirements - ``` pkg_add fftw3-float glew glfw portaudio-svn # install volk and SoapySDR manually ``` + ## The build ``` mkdir build cd build cmake --clang .. -cmake --build . --config Release +make +cd .. +./prepare_root.sh +cp -Rf root root_dev # if are in dev +mv root/modules ./ ``` +Run SDRPP with `build/sdrpp`. + # Contributing Feel free to issue pull request and report bugs via the github issues.