build: remove unused subprocess.h dependency

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "3rdparty/nanobench"]
 	path = 3rdparty/nanobench
 	url = https://github.com/martinus/nanobench
-[submodule "3rdparty/subprocess.h"]
-	path = 3rdparty/subprocess.h
-	url = https://github.com/sheredom/subprocess.h
 [submodule "3rdparty/pareto"]
 	path = 3rdparty/pareto
 	url = https://github.com/alandefreitas/pareto.git

3rdparty/subprocess.h

@@ -1 +0,0 @@
-Subproject commit a67899873722edddc22e66e41f6ae8a05a3a3a88

CMakeLists.txt

@@ -21,8 +21,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL "M
 endif()
 
 include_directories(
-	"${CMAKE_SOURCE_DIR}/include"
+	"${CMAKE_SOURCE_DIR}/include")
-	"${CMAKE_SOURCE_DIR}/3rdparty/subprocess.h")
 
 find_package (Threads)
 

tests/test_qbsp.cc

@@ -13,7 +13,6 @@
 #include <common/log.hh>
 #include <testmaps.hh>
 
-#include <subprocess.h>
 #include <nanobench.h>
 
 #include <fstream>
@@ -72,120 +71,6 @@ mapentity_t &LoadMapPath(const std::filesystem::path &name)
 
 #include <common/bspinfo.hh>
 
-#if 0
-std::tuple<mbsp_t, bspxentries_t, std::optional<prtfile_t>> LoadTestmapRef(const std::filesystem::path &name)
-{
-    const char *destdir = test_quake2_maps_dir;
-    if (strlen(destdir) == 0) {
-        return {};
-    }
-
-    auto testmap_path = std::filesystem::path(testmaps_dir) / name;
-    auto map_in_game_path = fs::path(destdir) / name.filename();
-    fs::copy(testmap_path, map_in_game_path, fs::copy_options::overwrite_existing);
-
-    std::string map_string = map_in_game_path.generic_string();
-
-    const char *command_line[] = {R"(C:\Users\Eric\Documents\q2tools-220\x64\Debug\4bsp.exe)",
-        map_string.c_str(),
-        NULL};
-
-    struct subprocess_s subprocess;
-    int result = subprocess_create(command_line, 0, &subprocess);
-    if (0 != result) {
-        throw std::runtime_error("error launching process");
-    }
-
-    // let the process write
-    FILE* p_stdout = subprocess_stdout(&subprocess);
-    char buf[32];
-    void *res;
-    do {
-        res = fgets(buf, 32, p_stdout);
-    } while (res != nullptr);
-
-    int retcode;
-    if (0 != subprocess_join(&subprocess, &retcode)) {
-        throw std::runtime_error("error joining");
-    }
-
-    // re-open the .bsp and return it
-    fs::path bsp_path = map_in_game_path;
-    bsp_path.replace_extension("bsp");
-
-    bspdata_t bspdata;
-    LoadBSPFile(bsp_path, &bspdata);
-
-    bspdata.version->game->init_filesystem(bsp_path, qbsp_options);
-
-    ConvertBSPFormat(&bspdata, &bspver_generic);
-
-    // write to .json for inspection
-    serialize_bsp(bspdata, std::get<mbsp_t>(bspdata.bsp), fs::path(bsp_path).replace_extension(".bsp.json"));
-
-    std::optional<prtfile_t> prtfile;
-    if (const auto prtpath = fs::path(bsp_path).replace_extension(".prt"); fs::exists(prtpath)) {
-        prtfile = {LoadPrtFile(prtpath, bspdata.loadversion)};
-    }
-
-    return std::make_tuple(std::move(std::get<mbsp_t>(bspdata.bsp)),
-        std::move(bspdata.bspx.entries),
-        std::move(prtfile));
-}
-
-std::tuple<mbsp_t, bspxentries_t, std::optional<prtfile_t>> LoadTestmapRefQ1(const std::filesystem::path &name)
-{
-    auto testmap_path = std::filesystem::path(testmaps_dir) / name;
-    std::string testmap_path_string = testmap_path.generic_string();
-
-    const char *command_line[] = {R"(C:\Users\Eric\Downloads\ericw-tools-v0.18.1-win64\bin\qbsp.exe)",
-        testmap_path_string.c_str(),
-        NULL};
-
-    struct subprocess_s subprocess;
-    int result = subprocess_create(command_line, 0, &subprocess);
-    if (0 != result) {
-        throw std::runtime_error("error launching process");
-    }
-
-    // let the process write
-    FILE* p_stdout = subprocess_stdout(&subprocess);
-    char buf[32];
-    void *res;
-    do {
-        res = fgets(buf, 32, p_stdout);
-    } while (res != nullptr);
-
-    int retcode;
-    if (0 != subprocess_join(&subprocess, &retcode)) {
-        throw std::runtime_error("error joining");
-    }
-
-    // re-open the .bsp and return it
-    fs::path bsp_path = testmap_path;
-    bsp_path.replace_extension("bsp");
-
-    bspdata_t bspdata;
-    LoadBSPFile(bsp_path, &bspdata);
-
-    bspdata.version->game->init_filesystem(bsp_path, qbsp_options);
-
-    ConvertBSPFormat(&bspdata, &bspver_generic);
-
-    // write to .json for inspection
-    serialize_bsp(bspdata, std::get<mbsp_t>(bspdata.bsp), fs::path(bsp_path).replace_extension(".bsp.json"));
-
-    std::optional<prtfile_t> prtfile;
-    if (const auto prtpath = fs::path(bsp_path).replace_extension(".prt"); fs::exists(prtpath)) {
-        prtfile = {LoadPrtFile(prtpath, bspdata.loadversion)};
-    }
-
-    return std::make_tuple(std::move(std::get<mbsp_t>(bspdata.bsp)),
-        std::move(bspdata.bspx.entries),
-        std::move(prtfile));
-}
-#endif
-
 std::tuple<mbsp_t, bspxentries_t, std::optional<prtfile_t>> LoadTestmap(const std::filesystem::path &name, std::vector<std::string> extra_args)
 {
     auto map_path = std::filesystem::path(testmaps_dir) / name;

tests/test_qbsp_q2.cc

@@ -2,7 +2,6 @@
 #include <common/bsputils.hh>
 #include <common/qvec.hh>
 
-#include <subprocess.h>
 #include <nanobench.h>
 
 #include <cstring>