Merge branch 'master' of git.learnjsthehardway.com:learn-code-the-hard-way/simple-cpp-game-study

This commit is contained in:
Zed A. Shaw 2024-05-10 17:23:20 -04:00
commit ccf37e758c
4 changed files with 6 additions and 5 deletions

View file

@ -5,7 +5,8 @@ cmake = import('cmake')
opts = cmake.subproject_options() opts = cmake.subproject_options()
opts.add_cmake_defines({ opts.add_cmake_defines({
'USE_ICONV': false, 'USE_ICONV': false,
'USE_SSH': 'exec', 'USE_SSH': false,
'USE_NTLMCLIENT': false,
'BUILD_SHARED_LIBS': true, 'BUILD_SHARED_LIBS': true,
'BUILD_TESTS': false, 'BUILD_TESTS': false,
}) })

View file

@ -6,9 +6,9 @@ rm -rf subprojects builddir
mkdir subprojects mkdir subprojects
mv packagecache ./subprojects/ mv packagecache ./subprojects/
mkdir builddir mkdir builddir
cp *.wrap subprojects
meson wrap install fmt meson wrap install fmt
meson wrap install sqlite3 meson wrap install sqlite3
meson wrap install sqlitecpp meson wrap install sqlitecpp
meson wrap install ftxui meson wrap install ftxui
cp *.wrap subprojects meson setup builddir
meson setup -Ddefault_library=static builddir

View file

@ -1,8 +1,8 @@
mkdir builddir mkdir builddir
mkdir subprojects mkdir subprojects
cp *.wrap subprojects
meson wrap install fmt meson wrap install fmt
meson wrap install sqlite3 meson wrap install sqlite3
meson wrap install sqlitecpp meson wrap install sqlitecpp
meson wrap install ftxui meson wrap install ftxui
cp *.wrap subprojects
meson setup -Ddefault_library=static builddir meson setup -Ddefault_library=static builddir

View file

@ -3,9 +3,9 @@ set -e
mkdir builddir mkdir builddir
mkdir subprojects mkdir subprojects
cp *.wrap subprojects
meson wrap install fmt meson wrap install fmt
meson wrap install sqlite3 meson wrap install sqlite3
meson wrap install sqlitecpp meson wrap install sqlitecpp
meson wrap install ftxui meson wrap install ftxui
cp *.wrap subprojects
meson setup builddir meson setup builddir