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

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,
   })

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

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

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