Update and fix Windows CI builds

- boost-spirit dependency needed to be installed
- Visual Studio wanted boost/filesystem.hpp included in more places
- a deprecated enum was removed from new versions of boost, so we use
  its replacement enum now
- vcpkg repository is now pinned to a commit where boost 1.84 libraries
  work smoothly, there should be no more surprises
- vcpkg dependencies now cache, so successive CI runs are dramatically
  faster
- for win-scons, we need to use 'call' in our batch script to source
  vcvarsall.bat
- I updated the includepath and libpath we pass to win-scons to match
  reality, but it still can't find any vcpkg libraries. This will need
  further sleuthing
This commit is contained in:
2024-05-27 15:59:07 -06:00
committed by Celtic Minstrel
parent c691b908a6
commit 1bb0927ecb
12 changed files with 88 additions and 12 deletions

View File

@@ -6,6 +6,7 @@
#include <algorithm>
#include <unordered_map>
#include <boost/lexical_cast.hpp>
#include <boost/filesystem.hpp>
#include "scen.global.hpp"
#include "scenario/scenario.hpp"
#include "scenario/town.hpp"
@@ -3591,7 +3592,7 @@ static bool edit_custom_sound_action(cDialog& me, std::string action, std::vecto
beep();
return true;
}
fs::copy_file(fpath, sndfile, fs::copy_option::overwrite_if_exists);
fs::copy_file(fpath, sndfile, fs::copy_options::overwrite_existing);
ResMgr::sounds.free(sound_to_fname(which_snd));
if(which_snd > max_snd)
max_snd = which_snd;
@@ -3602,7 +3603,7 @@ static bool edit_custom_sound_action(cDialog& me, std::string action, std::vecto
} else if(action == "save") {
fs::path fpath = nav_put_rsrc({"wav"});
if(fpath.empty()) return true;
fs::copy_file(sndfile, fpath, fs::copy_option::overwrite_if_exists);
fs::copy_file(sndfile, fpath, fs::copy_options::overwrite_existing);
}
return true;
}

View File

@@ -6,6 +6,7 @@
#include <fstream>
#include <iomanip>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem.hpp>
#include "scen.fileio.hpp"
#include "scen.keydlgs.hpp"
#include "gfx/gfxsheets.hpp"

View File

@@ -4,6 +4,7 @@
#include <map>
#include <numeric>
#include <boost/lexical_cast.hpp>
#include <boost/filesystem.hpp>
#include "scen.global.hpp"
#include "scenario/scenario.hpp"
#include "gfx/gfxsheets.hpp"