From 854ed89b824928201b5aa72d1497575000be377f Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Mon, 22 Jan 2024 20:30:53 +0100 Subject: [PATCH] prepare for merge back --- .github/workflows/build_all.yml | 2 +- CMakeLists.txt | 2 +- src/main.cpp | 24 ------------------------ 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 178b93f8..3654b8f0 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -122,7 +122,7 @@ jobs: - name: Prepare CMake working-directory: ${{runner.workspace}}/build - run: cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 $GITHUB_WORKSPACE -DOPT_BUILD_PLUTOSDR_SOURCE=ON -DOPT_BUILD_SOAPY_SOURCE=OFF -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_AUDIO_SINK=OFF -DOPT_BUILD_PORTAUDIO_SINK=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON -DOPT_BUILD_M17_DECODER=ON -DOPT_BUILD_PERSEUS_SOURCE=ON -DOPT_BUILD_AUDIO_SOURCE=OFF -DUSE_BUNDLE_DEFAULTS=ON -DCMAKE_BUILD_TYPE=Release + run: cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 $GITHUB_WORKSPACE -DOPT_BUILD_PLUTOSDR_SOURCE=ON -DOPT_BUILD_SOAPY_SOURCE=OFF -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_AUDIO_SINK=OFF -DOPT_BUILD_PORTAUDIO_SINK=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON -DOPT_BUILD_M17_DECODER=ON -DOPT_BUILD_PERSEUS_SOURCE=ON -DOPT_BUILD_AUDIO_SOURCE=OFF -DUSE_BUNDLE_DEFAULTS=ON -DCMAKE_BUILD_TYPE=Release - name: Build working-directory: ${{runner.workspace}}/build diff --git a/CMakeLists.txt b/CMakeLists.txt index e5cce405..a9c67193 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug") if (MSVC) set(SDRPP_COMPILER_FLAGS /std:c++17 /EHsc) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(SDRPP_COMPILER_FLAGS -g -Og -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup -fsanitize=address) + set(SDRPP_COMPILER_FLAGS -g -Og -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup) else () set(SDRPP_COMPILER_FLAGS -g -Og -std=c++17) endif () diff --git a/src/main.cpp b/src/main.cpp index 5e6e1838..7bc9d13d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,30 +1,6 @@ #include #include -#include - -extern char **environ; int main(int argc, char* argv[], char* envp[]) { - FILE* dump = fopen("/Users/ryzerth/dump.txt", "wb"); - - char buf[1024]; - fprintf(dump, "Working directory: %s\n\n", getcwd(buf, 1023)); - - fprintf(dump, "Arguments:\n"); - fprintf(dump, "----------\n"); - for (int i = 0; i < argc; i++) { - fprintf(dump, "%d: '%s'\n", i, argv[i]); - } - fprintf(dump, "\n"); - - fprintf(dump, "Environment Variables:\n"); - fprintf(dump, "----------\n"); - for (char** env = environ; *env; env++) { - fprintf(dump, "%s\n", *env); - } - fprintf(dump, "\n"); - - fclose(dump); - return sdrpp_main(argc, argv); } \ No newline at end of file