From 75e2c690a07d3478274aaff0b23208ab95a9ec24 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Fri, 10 May 2024 11:52:30 -0400 Subject: [PATCH] Make sure all the setup scripts are unified. --- PPP3/meson.build | 3 ++- PPP3/reset_build.sh | 4 ++-- PPP3/setup.ps1 | 2 +- PPP3/setup.sh | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/PPP3/meson.build b/PPP3/meson.build index d36bbd1..6b5bc5a 100644 --- a/PPP3/meson.build +++ b/PPP3/meson.build @@ -5,7 +5,8 @@ cmake = import('cmake') opts = cmake.subproject_options() opts.add_cmake_defines({ 'USE_ICONV': false, - 'USE_SSH': 'exec', + 'USE_SSH': false, + 'USE_NTLMCLIENT': false, 'BUILD_SHARED_LIBS': true, 'BUILD_TESTS': false, }) diff --git a/PPP3/reset_build.sh b/PPP3/reset_build.sh index 4f11bb5..3a35aa3 100755 --- a/PPP3/reset_build.sh +++ b/PPP3/reset_build.sh @@ -6,9 +6,9 @@ rm -rf subprojects builddir mkdir subprojects mv packagecache ./subprojects/ mkdir builddir +cp *.wrap subprojects meson wrap install fmt meson wrap install sqlite3 meson wrap install sqlitecpp meson wrap install ftxui -cp *.wrap subprojects -meson setup -Ddefault_library=static builddir +meson setup builddir diff --git a/PPP3/setup.ps1 b/PPP3/setup.ps1 index 9fe3a35..ebf8d3e 100644 --- a/PPP3/setup.ps1 +++ b/PPP3/setup.ps1 @@ -1,8 +1,8 @@ mkdir builddir mkdir subprojects +cp *.wrap subprojects meson wrap install fmt meson wrap install sqlite3 meson wrap install sqlitecpp meson wrap install ftxui -cp *.wrap subprojects meson setup -Ddefault_library=static builddir diff --git a/PPP3/setup.sh b/PPP3/setup.sh index 4ca5cf0..cd2c347 100755 --- a/PPP3/setup.sh +++ b/PPP3/setup.sh @@ -3,9 +3,9 @@ set -e mkdir builddir mkdir subprojects +cp *.wrap subprojects meson wrap install fmt meson wrap install sqlite3 meson wrap install sqlitecpp meson wrap install ftxui -cp *.wrap subprojects meson setup builddir