From 0689a086ac7dc9ea89f5610fc30ed7a14155f363 Mon Sep 17 00:00:00 2001
From: LWSS <bbchallenger100@gmail.com>
Date: Fri, 16 Feb 2024 13:32:17 -0800
Subject: [PATCH] tweak(build): Use Boost submodules instead of requiring
 builders to download+extract a full boost.zip somewhere.

This also lets us use/update specific parts.

No more BOOST_ROOT required!
---
 .github/workflows/ci_build.yml                |   6 -
 .gitmodules                                   | 203 +++++++++++++++++-
 code/premake5.lua                             |  73 ++++++-
 code/tools/ci/build_server_2.sh               |  15 --
 code/tools/ci/psm1/cfxRunPremake.psm1         |  16 --
 code/tools/ci/wsl-build.sh                    |   1 -
 code/vendor/boost_filesystem.lua              |   2 +-
 code/vendor/boost_locale.lua                  |   2 +-
 code/vendor/boost_program_options.lua         |   4 +-
 code/vendor/boost_random.lua                  |   4 +-
 code/vendor/boost_system.lua                  |   4 +-
 docs/building.md                              |   2 -
 vendor/boost-submodules/boost-algorithm       |   1 +
 vendor/boost-submodules/boost-any             |   1 +
 vendor/boost-submodules/boost-array           |   1 +
 vendor/boost-submodules/boost-asio            |   1 +
 vendor/boost-submodules/boost-assert          |   1 +
 vendor/boost-submodules/boost-atomic          |   1 +
 vendor/boost-submodules/boost-beast           |   1 +
 vendor/boost-submodules/boost-bimap           |   1 +
 vendor/boost-submodules/boost-bind            |   1 +
 vendor/boost-submodules/boost-chrono          |   1 +
 vendor/boost-submodules/boost-circular-buffer |   1 +
 vendor/boost-submodules/boost-concept-check   |   1 +
 vendor/boost-submodules/boost-config          |   1 +
 vendor/boost-submodules/boost-container       |   1 +
 vendor/boost-submodules/boost-container-hash  |   1 +
 vendor/boost-submodules/boost-context         |   1 +
 vendor/boost-submodules/boost-core            |   1 +
 vendor/boost-submodules/boost-coroutine       |   1 +
 vendor/boost-submodules/boost-crc             |   1 +
 vendor/boost-submodules/boost-date-time       |   1 +
 vendor/boost-submodules/boost-detail          |   1 +
 vendor/boost-submodules/boost-endian          |   1 +
 vendor/boost-submodules/boost-exception       |   1 +
 vendor/boost-submodules/boost-filesystem      |   1 +
 vendor/boost-submodules/boost-foreach         |   1 +
 vendor/boost-submodules/boost-function        |   1 +
 vendor/boost-submodules/boost-function-types  |   1 +
 vendor/boost-submodules/boost-fusion          |   1 +
 vendor/boost-submodules/boost-integer         |   1 +
 vendor/boost-submodules/boost-intrusive       |   1 +
 vendor/boost-submodules/boost-io              |   1 +
 vendor/boost-submodules/boost-iostreams       |   1 +
 vendor/boost-submodules/boost-iterator        |   1 +
 vendor/boost-submodules/boost-lexical-cast    |   1 +
 vendor/boost-submodules/boost-locale          |   1 +
 vendor/boost-submodules/boost-logic           |   1 +
 vendor/boost-submodules/boost-math            |   1 +
 vendor/boost-submodules/boost-move            |   1 +
 vendor/boost-submodules/boost-mp11            |   1 +
 vendor/boost-submodules/boost-mpl             |   1 +
 vendor/boost-submodules/boost-multi-index     |   1 +
 .../boost-submodules/boost-numeric-conversion |   1 +
 vendor/boost-submodules/boost-optional        |   1 +
 vendor/boost-submodules/boost-outcome         |   1 +
 vendor/boost-submodules/boost-predef          |   1 +
 .../{ => boost-submodules}/boost-preprocessor |   0
 vendor/boost-submodules/boost-program-options |   1 +
 vendor/boost-submodules/boost-property-tree   |   1 +
 vendor/boost-submodules/boost-random          |   1 +
 vendor/boost-submodules/boost-range           |   1 +
 vendor/boost-submodules/boost-ratio           |   1 +
 vendor/boost-submodules/boost-regex           |   1 +
 vendor/boost-submodules/boost-serialization   |   1 +
 vendor/boost-submodules/boost-smart-ptr       |   1 +
 vendor/boost-submodules/boost-static-assert   |   1 +
 vendor/boost-submodules/boost-system          |   1 +
 vendor/boost-submodules/boost-thread          |   1 +
 vendor/boost-submodules/boost-throw-exception |   1 +
 vendor/boost-submodules/boost-tokenizer       |   1 +
 vendor/boost-submodules/boost-tti             |   1 +
 vendor/boost-submodules/boost-tuple           |   1 +
 vendor/boost-submodules/boost-type-index      |   1 +
 vendor/boost-submodules/boost-type-traits     |   1 +
 vendor/boost-submodules/boost-unordered       |   1 +
 vendor/boost-submodules/boost-utility         |   1 +
 vendor/boost-submodules/boost-uuid            |   1 +
 vendor/boost-submodules/boost-variant         |   1 +
 vendor/boost-submodules/boost-winapi          |   1 +
 80 files changed, 347 insertions(+), 52 deletions(-)
 create mode 160000 vendor/boost-submodules/boost-algorithm
 create mode 160000 vendor/boost-submodules/boost-any
 create mode 160000 vendor/boost-submodules/boost-array
 create mode 160000 vendor/boost-submodules/boost-asio
 create mode 160000 vendor/boost-submodules/boost-assert
 create mode 160000 vendor/boost-submodules/boost-atomic
 create mode 160000 vendor/boost-submodules/boost-beast
 create mode 160000 vendor/boost-submodules/boost-bimap
 create mode 160000 vendor/boost-submodules/boost-bind
 create mode 160000 vendor/boost-submodules/boost-chrono
 create mode 160000 vendor/boost-submodules/boost-circular-buffer
 create mode 160000 vendor/boost-submodules/boost-concept-check
 create mode 160000 vendor/boost-submodules/boost-config
 create mode 160000 vendor/boost-submodules/boost-container
 create mode 160000 vendor/boost-submodules/boost-container-hash
 create mode 160000 vendor/boost-submodules/boost-context
 create mode 160000 vendor/boost-submodules/boost-core
 create mode 160000 vendor/boost-submodules/boost-coroutine
 create mode 160000 vendor/boost-submodules/boost-crc
 create mode 160000 vendor/boost-submodules/boost-date-time
 create mode 160000 vendor/boost-submodules/boost-detail
 create mode 160000 vendor/boost-submodules/boost-endian
 create mode 160000 vendor/boost-submodules/boost-exception
 create mode 160000 vendor/boost-submodules/boost-filesystem
 create mode 160000 vendor/boost-submodules/boost-foreach
 create mode 160000 vendor/boost-submodules/boost-function
 create mode 160000 vendor/boost-submodules/boost-function-types
 create mode 160000 vendor/boost-submodules/boost-fusion
 create mode 160000 vendor/boost-submodules/boost-integer
 create mode 160000 vendor/boost-submodules/boost-intrusive
 create mode 160000 vendor/boost-submodules/boost-io
 create mode 160000 vendor/boost-submodules/boost-iostreams
 create mode 160000 vendor/boost-submodules/boost-iterator
 create mode 160000 vendor/boost-submodules/boost-lexical-cast
 create mode 160000 vendor/boost-submodules/boost-locale
 create mode 160000 vendor/boost-submodules/boost-logic
 create mode 160000 vendor/boost-submodules/boost-math
 create mode 160000 vendor/boost-submodules/boost-move
 create mode 160000 vendor/boost-submodules/boost-mp11
 create mode 160000 vendor/boost-submodules/boost-mpl
 create mode 160000 vendor/boost-submodules/boost-multi-index
 create mode 160000 vendor/boost-submodules/boost-numeric-conversion
 create mode 160000 vendor/boost-submodules/boost-optional
 create mode 160000 vendor/boost-submodules/boost-outcome
 create mode 160000 vendor/boost-submodules/boost-predef
 rename vendor/{ => boost-submodules}/boost-preprocessor (100%)
 create mode 160000 vendor/boost-submodules/boost-program-options
 create mode 160000 vendor/boost-submodules/boost-property-tree
 create mode 160000 vendor/boost-submodules/boost-random
 create mode 160000 vendor/boost-submodules/boost-range
 create mode 160000 vendor/boost-submodules/boost-ratio
 create mode 160000 vendor/boost-submodules/boost-regex
 create mode 160000 vendor/boost-submodules/boost-serialization
 create mode 160000 vendor/boost-submodules/boost-smart-ptr
 create mode 160000 vendor/boost-submodules/boost-static-assert
 create mode 160000 vendor/boost-submodules/boost-system
 create mode 160000 vendor/boost-submodules/boost-thread
 create mode 160000 vendor/boost-submodules/boost-throw-exception
 create mode 160000 vendor/boost-submodules/boost-tokenizer
 create mode 160000 vendor/boost-submodules/boost-tti
 create mode 160000 vendor/boost-submodules/boost-tuple
 create mode 160000 vendor/boost-submodules/boost-type-index
 create mode 160000 vendor/boost-submodules/boost-type-traits
 create mode 160000 vendor/boost-submodules/boost-unordered
 create mode 160000 vendor/boost-submodules/boost-utility
 create mode 160000 vendor/boost-submodules/boost-uuid
 create mode 160000 vendor/boost-submodules/boost-variant
 create mode 160000 vendor/boost-submodules/boost-winapi

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 90113be783..043bef97b2 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -48,12 +48,6 @@ jobs:
         shell: bash
         run: |
           mkdir -p "$ROOT_DEP" && cd "$_" || exit 1
-          
-          echo Downloading boost
-          curl -s -L https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.7z -o boost.7z
-          7z -bso0 x boost.7z -oboost
-          rm boost.7z
-          echo "BOOST_ROOT=$PWD\boost\boost_1_71_0" >> "$GITHUB_ENV"
         
       - name: Compile
         shell: bash
diff --git a/.gitmodules b/.gitmodules
index 0cbc6f9621..22acf80548 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -278,8 +278,209 @@
 	path = vendor/rnnoise
 	url = https://github.com/mumble-voip/rnnoise.git
 [submodule "vendor/boost-preprocessor"]
-	path = vendor/boost-preprocessor
+	path = vendor/boost-submodules/boost-preprocessor
 	url = https://github.com/boostorg/preprocessor.git
 [submodule "vendor/msgpack-cpp"]
 	path = vendor/msgpack-cpp
 	url = https://github.com/msgpack/msgpack-c.git
+[submodule "vendor/boost-filesystem"]
+	path = vendor/boost-submodules/boost-filesystem
+	url = https://github.com/boostorg/filesystem
+[submodule "vendor/boost-locale"]
+	path = vendor/boost-submodules/boost-locale
+	url = https://github.com/boostorg/locale
+[submodule "vendor/boost-program-options"]
+	path = vendor/boost-submodules/boost-program-options
+	url = https://github.com/boostorg/program_options
+[submodule "vendor/boost-random"]
+	path = vendor/boost-submodules/boost-random
+	url = https://github.com/boostorg/random
+[submodule "vendor/boost-system"]
+	path = vendor/boost-submodules/boost-system
+	url = https://github.com/boostorg/system
+[submodule "vendor/boost-context"]
+	path = vendor/boost-submodules/boost-context
+	url = https://github.com/boostorg/context
+[submodule "vendor/boost-coroutine"]
+	path = vendor/boost-submodules/boost-coroutine
+	url = https://github.com/boostorg/coroutine
+[submodule "vendor/boost-thread"]
+	path = vendor/boost-submodules/boost-thread
+	url = https://github.com/boostorg/thread
+[submodule "vendor/boost-config"]
+	path = vendor/boost-submodules/boost-config
+	url = https://github.com/boostorg/config
+[submodule "vendor/boost-any"]
+	path = vendor/boost-submodules/boost-any
+	url = https://github.com/boostorg/any/
+[submodule "vendor/boost-assert"]
+	path = vendor/boost-submodules/boost-assert
+	url = https://github.com/boostorg/assert
+[submodule "vendor/boost-function"]
+	path = vendor/boost-submodules/boost-function
+	url = https://github.com/boostorg/function
+[submodule "vendor/boost-detail"]
+	path = vendor/boost-submodules/boost-detail
+	url = https://github.com/boostorg/detail
+[submodule "vendor/boost-smart-ptr"]
+	path = vendor/boost-submodules/boost-smart-ptr
+	url = https://github.com/boostorg/smart_ptr/
+[submodule "vendor/boost-static-assert"]
+	path = vendor/boost-submodules/boost-static-assert
+	url = https://github.com/boostorg/static_assert
+[submodule "vendor/boost-throw-exception"]
+	path = vendor/boost-submodules/boost-throw-exception
+	url = https://github.com/boostorg/throw_exception
+[submodule "vendor/boost-type-index"]
+	path = vendor/boost-submodules/boost-type-index
+	url = https://github.com/boostorg/type_index
+[submodule "vendor/boost-type-traits"]
+	path = vendor/boost-submodules/boost-type-traits
+	url = https://github.com/boostorg/type_traits
+[submodule "vendor/boost-predef"]
+	path = vendor/boost-submodules/boost-predef
+	url = https://github.com/boostorg/predef
+[submodule "vendor/boost-core"]
+	path = vendor/boost-submodules/boost-core
+	url = https://github.com/boostorg/core
+[submodule "vendor/boost-iterator"]
+	path = vendor/boost-submodules/boost-iterator
+	url = https://github.com/boostorg/iterator
+[submodule "vendor/boost-move"]
+	path = vendor/boost-submodules/boost-move
+	url = https://github.com/boostorg/move
+[submodule "vendor/boost-winapi"]
+	path = vendor/boost-submodules/boost-winapi
+	url = https://github.com/boostorg/winapi
+[submodule "vendor/boost-mpl"]
+	path = vendor/boost-submodules/boost-mpl
+	url = https://github.com/boostorg/mpl
+[submodule "vendor/boost-integer"]
+	path = vendor/boost-submodules/boost-integer
+	url = https://github.com/boostorg/integer
+[submodule "vendor/boost-container-hash"]
+	path = vendor/boost-submodules/boost-container-hash
+	url = https://github.com/boostorg/container_hash
+[submodule "vendor/boost-bind"]
+	path = vendor/boost-submodules/boost-bind
+	url = https://github.com/boostorg/bind
+[submodule "vendor/boost-unordered"]
+	path = vendor/boost-submodules/boost-unordered
+	url = https://github.com/boostorg/unordered
+[submodule "vendor/boost-lexical-cast"]
+	path = vendor/boost-submodules/boost-lexical-cast
+	url = https://github.com/boostorg/lexical_cast
+[submodule "vendor/boost-io"]
+	path = vendor/boost-submodules/boost-io
+	url = https://github.com/boostorg/io
+[submodule "vendor/boost-date-time"]
+	path = vendor/boost-submodules/boost-date-time
+	url = https://github.com/boostorg/date_time
+[submodule "vendor/boost-range"]
+	path = vendor/boost-submodules/boost-range
+	url = https://github.com/boostorg/range
+[submodule "vendor/boost-tuple"]
+	path = vendor/boost-submodules/boost-tuple
+	url = https://github.com/boostorg/tuple
+[submodule "vendor/boost-concept-check"]
+	path = vendor/boost-submodules/boost-concept-check
+	url = https://github.com/boostorg/concept_check/
+[submodule "vendor/boost-utility"]
+	path = vendor/boost-submodules/boost-utility
+	url = https://github.com/boostorg/utility
+[submodule "vendor/boost-numeric-conversion"]
+	path = vendor/boost-submodules/boost-numeric-conversion
+	url = https://github.com/boostorg/numeric_conversion
+[submodule "vendor/boost-chrono"]
+	path = vendor/boost-submodules/boost-chrono
+	url = https://github.com/boostorg/chrono
+[submodule "vendor/boost-array"]
+	path = vendor/boost-submodules/boost-array
+	url = https://github.com/boostorg/array
+[submodule "vendor/boost-ratio"]
+	path = vendor/boost-submodules/boost-ratio
+	url = https://github.com/boostorg/ratio
+[submodule "vendor/boost-container"]
+	path = vendor/boost-submodules/boost-container
+	url = https://github.com/boostorg/container
+[submodule "vendor/boost-math"]
+	path = vendor/boost-submodules/boost-math
+	url = https://github.com/boostorg/math
+[submodule "vendor/boost-property-tree"]
+	path = vendor/boost-submodules/boost-property-tree
+	url = https://github.com/boostorg/property_tree
+[submodule "vendor/boost-optional"]
+	path = vendor/boost-submodules/boost-optional
+	url = https://github.com/boostorg/optional
+[submodule "vendor/boost-fusion"]
+	path = vendor/boost-submodules/boost-fusion
+	url = https://github.com/boostorg/fusion
+[submodule "vendor/boost-function-types"]
+	path = vendor/boost-submodules/boost-function-types
+	url = https://github.com/boostorg/function_types
+[submodule "vendor/boost-circular-buffer"]
+	path = vendor/boost-submodules/boost-circular-buffer
+	url = https://github.com/boostorg/circular_buffer
+[submodule "vendor/boost-bimap"]
+	path = vendor/boost-submodules/boost-bimap
+	url = https://github.com/boostorg/bimap
+[submodule "vendor/boost-algorithm"]
+	path = vendor/boost-submodules/boost-algorithm
+	url = https://github.com/boostorg/algorithm
+[submodule "vendor/boost-variant"]
+	path = vendor/boost-submodules/boost-variant
+	url = https://github.com/boostorg/variant
+[submodule "vendor/boost-serialization"]
+	path = vendor/boost-submodules/boost-serialization
+	url = https://github.com/boostorg/serialization
+[submodule "vendor/boost-exception"]
+	path = vendor/boost-submodules/boost-exception
+	url = https://github.com/boostorg/exception
+[submodule "vendor/boost-multi-index"]
+	path = vendor/boost-submodules/boost-multi-index
+	url = https://github.com/boostorg/multi_index
+[submodule "vendor/boost-foreach"]
+	path = vendor/boost-submodules/boost-foreach
+	url = https://github.com/boostorg/foreach
+[submodule "vendor/boost-uuid"]
+	path = vendor/boost-submodules/boost-uuid
+	url = https://github.com/boostorg/uuid
+[submodule "vendor/boost-regex"]
+	path = vendor/boost-submodules/boost-regex
+	url = https://github.com/boostorg/regex
+[submodule "vendor/boost-crc"]
+	path = vendor/boost-submodules/boost-crc
+	url = https://github.com/boostorg/crc
+[submodule "vendor/boost-tti"]
+	path = vendor/boost-submodules/boost-tti
+	url = https://github.com/boostorg/tti
+[submodule "vendor/boost-submodules/boost-outcome"]
+	path = vendor/boost-submodules/boost-outcome
+	url = https://github.com/boostorg/outcome
+[submodule "vendor/boost-submodules/boost-asio"]
+	path = vendor/boost-submodules/boost-asio
+	url = https://github.com/boostorg/asio
+[submodule "vendor/boost-submodules/boost-atomic"]
+	path = vendor/boost-submodules/boost-atomic
+	url = https://github.com/boostorg/atomic
+[submodule "vendor/boost-submodules/boost-beast"]
+	path = vendor/boost-submodules/boost-beast
+	url = https://github.com/boostorg/beast
+[submodule "vendor/boost-submodules/boost-intrusive"]
+	path = vendor/boost-submodules/boost-intrusive
+	url = https://github.com/boostorg/intrusive
+[submodule "vendor/boost-submodules/boost-mp11"]
+	path = vendor/boost-submodules/boost-mp11
+	url = https://github.com/boostorg/mp11
+[submodule "vendor/boost-submodules/boost-logic"]
+	path = vendor/boost-submodules/boost-logic
+	url = https://github.com/boostorg/logic
+[submodule "vendor/boost-submodules/boost-endian"]
+	path = vendor/boost-submodules/boost-endian
+	url = https://github.com/boostorg/endian
+[submodule "vendor/boost-submodules/boost-iostreams"]
+	path = vendor/boost-submodules/boost-iostreams
+	url = https://github.com/boostorg/iostreams
+[submodule "vendor/boost-submodules/boost-tokenizer"]
+	path = vendor/boost-submodules/boost-tokenizer
+	url = https://github.com/boostorg/tokenizer
diff --git a/code/premake5.lua b/code/premake5.lua
index 62c586df50..77bdba7f93 100644
--- a/code/premake5.lua
+++ b/code/premake5.lua
@@ -75,13 +75,80 @@ workspace "CitizenMP"
 		"../vendor/rapidjson/include/",
 		"../vendor/fmtlib/include/",
 		"deplibs/include/",
-		"../vendor/boost-preprocessor/include/",
-		os.getenv("BOOST_ROOT")
+		"../vendor/boost-submodules/boost-context/include/",
+		"../vendor/boost-submodules/boost-filesystem/include/",
+		"../vendor/boost-submodules/boost-locale/include/",
+		"../vendor/boost-submodules/boost-preprocessor/include/",
+		"../vendor/boost-submodules/boost-program-options/include/",
+		"../vendor/boost-submodules/boost-random/include/",
+		"../vendor/boost-submodules/boost-system/include/",
+		"../vendor/boost-submodules/boost-thread/include/",
+		
+		"../vendor/boost-submodules/boost-config/include/",
+		"../vendor/boost-submodules/boost-any/include/",
+		"../vendor/boost-submodules/boost-assert/include/",
+		"../vendor/boost-submodules/boost-detail/include/",
+		"../vendor/boost-submodules/boost-function/include/",
+		"../vendor/boost-submodules/boost-smart-ptr/include/",
+		"../vendor/boost-submodules/boost-static-assert/include/",
+		"../vendor/boost-submodules/boost-throw-exception/include/",
+		"../vendor/boost-submodules/boost-type-traits/include/",
+		"../vendor/boost-submodules/boost-type-index/include/",
+		"../vendor/boost-submodules/boost-predef/include/",
+		"../vendor/boost-submodules/boost-core/include/",
+		"../vendor/boost-submodules/boost-iterator/include/",
+		"../vendor/boost-submodules/boost-move/include/",
+		"../vendor/boost-submodules/boost-winapi/include/",
+		"../vendor/boost-submodules/boost-mpl/include/",
+		"../vendor/boost-submodules/boost-integer/include/",
+		"../vendor/boost-submodules/boost-container-hash/include/",
+		"../vendor/boost-submodules/boost-bind/include/",
+		"../vendor/boost-submodules/boost-unordered/include/",
+		"../vendor/boost-submodules/boost-lexical-cast/include/",
+		"../vendor/boost-submodules/boost-io/include/",
+		"../vendor/boost-submodules/boost-date-time/include/",
+		"../vendor/boost-submodules/boost-range/include/",
+		"../vendor/boost-submodules/boost-tuple/include/",
+		"../vendor/boost-submodules/boost-concept-check/include/",
+		"../vendor/boost-submodules/boost-utility/include/",
+		"../vendor/boost-submodules/boost-numeric-conversion/include/",
+		"../vendor/boost-submodules/boost-chrono/include/",
+		"../vendor/boost-submodules/boost-array/include/",
+		"../vendor/boost-submodules/boost-ratio/include/",
+		"../vendor/boost-submodules/boost-container/include/",
+		"../vendor/boost-submodules/boost-math/include/",
+		"../vendor/boost-submodules/boost-tokenizer/include/",
+		"../vendor/boost-submodules/boost-property-tree/include/",
+		"../vendor/boost-submodules/boost-optional/include/",
+		"../vendor/boost-submodules/boost-fusion/include/",
+		"../vendor/boost-submodules/boost-function-types/include/",
+		"../vendor/boost-submodules/boost-circular-buffer/include/",
+		"../vendor/boost-submodules/boost-bimap/include/",
+		"../vendor/boost-submodules/boost-algorithm/include/",
+		"../vendor/boost-submodules/boost-variant/include/",
+		"../vendor/boost-submodules/boost-serialization/include/",
+		"../vendor/boost-submodules/boost-exception/include/",
+		"../vendor/boost-submodules/boost-multi-index/include/",
+		"../vendor/boost-submodules/boost-foreach/include/",
+		"../vendor/boost-submodules/boost-uuid/include/",
+		"../vendor/boost-submodules/boost-regex/include/",
+		"../vendor/boost-submodules/boost-crc/include/",
+		"../vendor/boost-submodules/boost-tti/include/",
+		"../vendor/boost-submodules/boost-outcome/include/",
+		"../vendor/boost-submodules/boost-coroutine/include/",
+		"../vendor/boost-submodules/boost-asio/include/",
+		"../vendor/boost-submodules/boost-atomic/include/",
+		"../vendor/boost-submodules/boost-beast/include/",
+		"../vendor/boost-submodules/boost-intrusive/include/",
+		"../vendor/boost-submodules/boost-iostreams/include/",
+		"../vendor/boost-submodules/boost-mp11/include/",
+		"../vendor/boost-submodules/boost-logic/include/",
+		"../vendor/boost-submodules/boost-endian/include/",
 	}
 
 	filter { 'language:C or language:C++'}
 		defines { "GTEST_HAS_PTHREAD=0", "BOOST_ALL_NO_LIB" }
-
+ 		defines { "BOOST_NULLPTR=nullptr" }
 		defines { "_HAS_AUTO_PTR_ETC" } -- until boost gets fixed
 
 	filter {}
diff --git a/code/tools/ci/build_server_2.sh b/code/tools/ci/build_server_2.sh
index 8414757160..f42855cc01 100644
--- a/code/tools/ci/build_server_2.sh
+++ b/code/tools/ci/build_server_2.sh
@@ -96,21 +96,6 @@ EOF
 	lua5.3 codegen.lua inp/natives_global.lua rpc server > /opt/cfx-server/citizen/scripting/rpc_natives.json
 fi
 
-# download and extract boost
-cd /tmp
-
-# keeping this here as a note that boost is really dumb for using "jfrog artifactory bintray" which gives constant persistent 'Forbidden!'
-# whenever some arbitrary quota runs out, and deletes their version history on sourceforge, and has no single canonical git repo
-#curl --http1.1 -sLo /tmp/boost.tar.bz2 https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
-curl --http1.1 -sLo /tmp/boost.tar.bz2 https://runtime.fivem.net/client/deps/boost_1_71_0.tar.bz2
-
-tar xf boost.tar.bz2
-rm boost.tar.bz2
-
-mv boost_* boost || true
-
-export BOOST_ROOT=/tmp/boost/
-
 # download and build premake
 curl --http1.1 -sLo /tmp/premake.zip https://github.com/premake/premake-core/releases/download/v5.0.0-beta1/premake-5.0.0-beta1-src.zip
 
diff --git a/code/tools/ci/psm1/cfxRunPremake.psm1 b/code/tools/ci/psm1/cfxRunPremake.psm1
index a37b0a331c..c57722d1aa 100644
--- a/code/tools/ci/psm1/cfxRunPremake.psm1
+++ b/code/tools/ci/psm1/cfxRunPremake.psm1
@@ -7,22 +7,6 @@ function Invoke-RunPremake {
         [CfxBuildTools] $Tools
     )
 
-    # Ensure we have BOOST_ROOT
-    if (!$env:BOOST_ROOT -or !(Test-Path $env:BOOST_ROOT)) {
-        $cDevPath = "C:\dev\boost_1_71_0"
-        $cLibrariesPath = "C:\Libraries\boost_1_71_0"
-
-        if (Test-Path $cDevPath) {
-            $env:BOOST_ROOT = $cDevPath
-        }
-        elseif (Test-Path $cLibrariesPath) {
-            $env:BOOST_ROOT = $cLibrariesPath
-        }
-        else {
-            throw "Unable to find BOOST library, make sure you have the correct path in the BOOST_ROOT env var"
-        }
-    }
-
     Push-Location $Context.CodeRoot
         & $Tools.premake @(
             $Context.PremakeVSVersion
diff --git a/code/tools/ci/wsl-build.sh b/code/tools/ci/wsl-build.sh
index 5d727a0a14..049daf9061 100644
--- a/code/tools/ci/wsl-build.sh
+++ b/code/tools/ci/wsl-build.sh
@@ -26,7 +26,6 @@ fi
 cp -a tools/ci/build_server_2.sh /tmp/build_server.sh
 sed -i -e '1,/^## SETUP-CUTOFF/d' -e '/^## BUILD-CUTOFF/,$ d' -e 's/.*make clean.*//g' -e 's/config=release/config=debug/g' -e 's/linux\/release/linux\/debug/g' /tmp/build_server.sh
 
-export BOOST_ROOT=/tmp/boost/
 JOB_SLOTS=$(nproc) sh -e /tmp/build_server.sh
 
 echo '------------------'
diff --git a/code/vendor/boost_filesystem.lua b/code/vendor/boost_filesystem.lua
index b29134b1ae..88b754dfe1 100644
--- a/code/vendor/boost_filesystem.lua
+++ b/code/vendor/boost_filesystem.lua
@@ -7,7 +7,7 @@ return {
 		language "C++"
 		kind 'StaticLib'
 
-		files_project(os.getenv("BOOST_ROOT") .. '/libs/filesystem/src/')
+		files_project('../vendor/boost-submodules/boost-filesystem/src/')
 		{
 			'codecvt_error_category.cpp',
 			'operations.cpp',
diff --git a/code/vendor/boost_locale.lua b/code/vendor/boost_locale.lua
index e92f83052e..84721edc69 100644
--- a/code/vendor/boost_locale.lua
+++ b/code/vendor/boost_locale.lua
@@ -15,7 +15,7 @@ return {
 		
 		defines { 'BOOST_LOCALE_NO_STD_BACKEND', 'BOOST_LOCALE_NO_POSIX_BACKEND' }
 
-		files_project(os.getenv("BOOST_ROOT") .. '/libs/locale/src/')
+		files_project('../vendor/boost-submodules/boost-locale/src/')
 		{
 			'encoding/codepage.cpp',
 			'shared/date_time.cpp',
diff --git a/code/vendor/boost_program_options.lua b/code/vendor/boost_program_options.lua
index 404d6d5970..0499f09afe 100644
--- a/code/vendor/boost_program_options.lua
+++ b/code/vendor/boost_program_options.lua
@@ -3,7 +3,7 @@ return {
 		language "C++"
 		kind 'StaticLib'
 
-		files_project(os.getenv("BOOST_ROOT") .. '/libs/program_options/src/')
+		files_project('../vendor/boost-submodules/boost-program-options/src/')
 		{
 			'cmdline.cpp',
 			'config_file.cpp',
@@ -18,7 +18,7 @@ return {
 		}
 
 		filter 'system:windows'
-			files_project(os.getenv("BOOST_ROOT") .. '/libs/program_options/src/')
+			files_project('../vendor/boost-submodules/boost-program-options/src/')
 			{
 				'winmain.cpp'
 			}
diff --git a/code/vendor/boost_random.lua b/code/vendor/boost_random.lua
index 43b2409eee..c134b49c38 100644
--- a/code/vendor/boost_random.lua
+++ b/code/vendor/boost_random.lua
@@ -7,9 +7,9 @@ return {
 		language "C++"
 		kind 'StaticLib'
 
-		files_project(os.getenv("BOOST_ROOT") .. '/libs/random/src/')
+		files_project('../vendor/boost-submodules/boost-random/src/')
 		{
-			'*.cpp'
+			'random_device.cpp'
 		}
 	end
 }
diff --git a/code/vendor/boost_system.lua b/code/vendor/boost_system.lua
index 1b4e692018..0078ce6a7d 100644
--- a/code/vendor/boost_system.lua
+++ b/code/vendor/boost_system.lua
@@ -3,9 +3,9 @@ return {
 		language "C++"
 		kind 'StaticLib'
 
-		files_project(os.getenv("BOOST_ROOT") .. '/libs/system/src/')
+		files_project('../vendor/boost-submodules/boost-system/src/')
 		{
-			'*.cpp'
+			'error_code.cpp'
 		}
 	end
 }
diff --git a/docs/building.md b/docs/building.md
index 07da2e1842..1a3e5db662 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -12,7 +12,6 @@ To build FiveM, RedM or FXServer on Windows you need the following dependencies:
   You can install these workloads by going to "Tools" -> "Get Tools and Features..." -> Check the checkboxes -> Click "Modify" in the bottom right corner.
   
 * [PowerShell 7](https://aka.ms/powershell-release?tag=stable) or higher.
-* [Boost 1.71.0](https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.7z), extracted to a path defined by the environment variable `BOOST_ROOT`.
 * [Python 3.8 or higher](https://python.org/) with the `py` launcher installed.
 * [MSYS2](https://www.msys2.org/) at `C:\msys64\` which is where the installer places it.
 * [Node.js](https://nodejs.org/en/download/) and [Yarn](https://classic.yarnpkg.com/en/docs/install/) in your PATH as `node` and `yarn`.
@@ -20,7 +19,6 @@ To build FiveM, RedM or FXServer on Windows you need the following dependencies:
 Then, execute the following commands in a `cmd.exe` shell to set up the build environment:
 
 ```bat
-set BOOST_ROOT=C:\libraries\boost_1_71_0
 git clone https://github.com/citizenfx/fivem.git -c core.symlinks=true
 cd fivem
 git submodule update --jobs=16 --init
diff --git a/vendor/boost-submodules/boost-algorithm b/vendor/boost-submodules/boost-algorithm
new file mode 160000
index 0000000000..1b65b8de02
--- /dev/null
+++ b/vendor/boost-submodules/boost-algorithm
@@ -0,0 +1 @@
+Subproject commit 1b65b8de02175823914ae00d05b8222e2de9bba6
diff --git a/vendor/boost-submodules/boost-any b/vendor/boost-submodules/boost-any
new file mode 160000
index 0000000000..8e24fabe52
--- /dev/null
+++ b/vendor/boost-submodules/boost-any
@@ -0,0 +1 @@
+Subproject commit 8e24fabe52b414b8931994e2e51c65f90ab85f99
diff --git a/vendor/boost-submodules/boost-array b/vendor/boost-submodules/boost-array
new file mode 160000
index 0000000000..520d8987f7
--- /dev/null
+++ b/vendor/boost-submodules/boost-array
@@ -0,0 +1 @@
+Subproject commit 520d8987f7abc129f352b729e02a3915f3556b41
diff --git a/vendor/boost-submodules/boost-asio b/vendor/boost-submodules/boost-asio
new file mode 160000
index 0000000000..77d3089f2e
--- /dev/null
+++ b/vendor/boost-submodules/boost-asio
@@ -0,0 +1 @@
+Subproject commit 77d3089f2ee5939e558154a80d4dfba261d16971
diff --git a/vendor/boost-submodules/boost-assert b/vendor/boost-submodules/boost-assert
new file mode 160000
index 0000000000..45a7c1f922
--- /dev/null
+++ b/vendor/boost-submodules/boost-assert
@@ -0,0 +1 @@
+Subproject commit 45a7c1f922051ebfc63b882b44f9cec39a4addb1
diff --git a/vendor/boost-submodules/boost-atomic b/vendor/boost-submodules/boost-atomic
new file mode 160000
index 0000000000..fc41097514
--- /dev/null
+++ b/vendor/boost-submodules/boost-atomic
@@ -0,0 +1 @@
+Subproject commit fc410975146a23e0513e8164009cc1eac2d9830b
diff --git a/vendor/boost-submodules/boost-beast b/vendor/boost-submodules/boost-beast
new file mode 160000
index 0000000000..6d614cf9a8
--- /dev/null
+++ b/vendor/boost-submodules/boost-beast
@@ -0,0 +1 @@
+Subproject commit 6d614cf9a8c6d81258e309682621286bf9d74ec3
diff --git a/vendor/boost-submodules/boost-bimap b/vendor/boost-submodules/boost-bimap
new file mode 160000
index 0000000000..223b2cf3a5
--- /dev/null
+++ b/vendor/boost-submodules/boost-bimap
@@ -0,0 +1 @@
+Subproject commit 223b2cf3a5d633c5a4f11e07ce242f51bcf61a06
diff --git a/vendor/boost-submodules/boost-bind b/vendor/boost-submodules/boost-bind
new file mode 160000
index 0000000000..d6ac20c4fd
--- /dev/null
+++ b/vendor/boost-submodules/boost-bind
@@ -0,0 +1 @@
+Subproject commit d6ac20c4fdfb9103a4a5d15f2499c339e525e2a4
diff --git a/vendor/boost-submodules/boost-chrono b/vendor/boost-submodules/boost-chrono
new file mode 160000
index 0000000000..5df12496f5
--- /dev/null
+++ b/vendor/boost-submodules/boost-chrono
@@ -0,0 +1 @@
+Subproject commit 5df12496f52e00b1ea324df176a4a3199d3d8bfd
diff --git a/vendor/boost-submodules/boost-circular-buffer b/vendor/boost-submodules/boost-circular-buffer
new file mode 160000
index 0000000000..7e56abf99b
--- /dev/null
+++ b/vendor/boost-submodules/boost-circular-buffer
@@ -0,0 +1 @@
+Subproject commit 7e56abf99b2fd883619b933dd53d957d3aaad861
diff --git a/vendor/boost-submodules/boost-concept-check b/vendor/boost-submodules/boost-concept-check
new file mode 160000
index 0000000000..db1f9c73a4
--- /dev/null
+++ b/vendor/boost-submodules/boost-concept-check
@@ -0,0 +1 @@
+Subproject commit db1f9c73a43fc527a43a66bd77d8981b845c8712
diff --git a/vendor/boost-submodules/boost-config b/vendor/boost-submodules/boost-config
new file mode 160000
index 0000000000..bbda3f0aba
--- /dev/null
+++ b/vendor/boost-submodules/boost-config
@@ -0,0 +1 @@
+Subproject commit bbda3f0aba785b741c3acb615b7b4e3c077df62c
diff --git a/vendor/boost-submodules/boost-container b/vendor/boost-submodules/boost-container
new file mode 160000
index 0000000000..d9341ec394
--- /dev/null
+++ b/vendor/boost-submodules/boost-container
@@ -0,0 +1 @@
+Subproject commit d9341ec394ef97bd1b36f05b5e6be6ec538e480c
diff --git a/vendor/boost-submodules/boost-container-hash b/vendor/boost-submodules/boost-container-hash
new file mode 160000
index 0000000000..9fbda1a98a
--- /dev/null
+++ b/vendor/boost-submodules/boost-container-hash
@@ -0,0 +1 @@
+Subproject commit 9fbda1a98a32498c52a1c8ebf62311bb36a44ad4
diff --git a/vendor/boost-submodules/boost-context b/vendor/boost-submodules/boost-context
new file mode 160000
index 0000000000..227fbd01f2
--- /dev/null
+++ b/vendor/boost-submodules/boost-context
@@ -0,0 +1 @@
+Subproject commit 227fbd01f2903445ad294e922dfefabd73702d0a
diff --git a/vendor/boost-submodules/boost-core b/vendor/boost-submodules/boost-core
new file mode 160000
index 0000000000..eba08e936a
--- /dev/null
+++ b/vendor/boost-submodules/boost-core
@@ -0,0 +1 @@
+Subproject commit eba08e936a807e0cae03c0d50160457f578b71aa
diff --git a/vendor/boost-submodules/boost-coroutine b/vendor/boost-submodules/boost-coroutine
new file mode 160000
index 0000000000..f6741b3887
--- /dev/null
+++ b/vendor/boost-submodules/boost-coroutine
@@ -0,0 +1 @@
+Subproject commit f6741b38876f4290d7afc40a32c825c830e58cec
diff --git a/vendor/boost-submodules/boost-crc b/vendor/boost-submodules/boost-crc
new file mode 160000
index 0000000000..28d2df3803
--- /dev/null
+++ b/vendor/boost-submodules/boost-crc
@@ -0,0 +1 @@
+Subproject commit 28d2df3803fbab1e3799cdfd91296f7006b8a495
diff --git a/vendor/boost-submodules/boost-date-time b/vendor/boost-submodules/boost-date-time
new file mode 160000
index 0000000000..29bb209464
--- /dev/null
+++ b/vendor/boost-submodules/boost-date-time
@@ -0,0 +1 @@
+Subproject commit 29bb2094646d0ffac43db4fc61a907306b2a8e68
diff --git a/vendor/boost-submodules/boost-detail b/vendor/boost-submodules/boost-detail
new file mode 160000
index 0000000000..fc781c8a5a
--- /dev/null
+++ b/vendor/boost-submodules/boost-detail
@@ -0,0 +1 @@
+Subproject commit fc781c8a5aca36dc32f4d1d5238b7bd2eaa7dc8f
diff --git a/vendor/boost-submodules/boost-endian b/vendor/boost-submodules/boost-endian
new file mode 160000
index 0000000000..b816d97235
--- /dev/null
+++ b/vendor/boost-submodules/boost-endian
@@ -0,0 +1 @@
+Subproject commit b816d97235ee96eee231723eeccf1f838bf7c339
diff --git a/vendor/boost-submodules/boost-exception b/vendor/boost-submodules/boost-exception
new file mode 160000
index 0000000000..c44bdae6ac
--- /dev/null
+++ b/vendor/boost-submodules/boost-exception
@@ -0,0 +1 @@
+Subproject commit c44bdae6acf7a4bf06421e44e2938a0f130e2031
diff --git a/vendor/boost-submodules/boost-filesystem b/vendor/boost-submodules/boost-filesystem
new file mode 160000
index 0000000000..812cb9bad3
--- /dev/null
+++ b/vendor/boost-submodules/boost-filesystem
@@ -0,0 +1 @@
+Subproject commit 812cb9bad3bcbb2161c7cd2c1132b51c4b29c4b9
diff --git a/vendor/boost-submodules/boost-foreach b/vendor/boost-submodules/boost-foreach
new file mode 160000
index 0000000000..88c8eae675
--- /dev/null
+++ b/vendor/boost-submodules/boost-foreach
@@ -0,0 +1 @@
+Subproject commit 88c8eae6759f1984dd7e22629660f0e39c5907ee
diff --git a/vendor/boost-submodules/boost-function b/vendor/boost-submodules/boost-function
new file mode 160000
index 0000000000..4b25a75c03
--- /dev/null
+++ b/vendor/boost-submodules/boost-function
@@ -0,0 +1 @@
+Subproject commit 4b25a75c03838fec2ed2698f2695f80233a0c7fa
diff --git a/vendor/boost-submodules/boost-function-types b/vendor/boost-submodules/boost-function-types
new file mode 160000
index 0000000000..ae4fde2e2a
--- /dev/null
+++ b/vendor/boost-submodules/boost-function-types
@@ -0,0 +1 @@
+Subproject commit ae4fde2e2ae88291d6d656137169ff4003d184a1
diff --git a/vendor/boost-submodules/boost-fusion b/vendor/boost-submodules/boost-fusion
new file mode 160000
index 0000000000..81a1c2c99a
--- /dev/null
+++ b/vendor/boost-submodules/boost-fusion
@@ -0,0 +1 @@
+Subproject commit 81a1c2c99a06d35852a3686d6d461c3290fbccd5
diff --git a/vendor/boost-submodules/boost-integer b/vendor/boost-submodules/boost-integer
new file mode 160000
index 0000000000..33c165552c
--- /dev/null
+++ b/vendor/boost-submodules/boost-integer
@@ -0,0 +1 @@
+Subproject commit 33c165552cf1f9f16720acac43ad5477d58483f7
diff --git a/vendor/boost-submodules/boost-intrusive b/vendor/boost-submodules/boost-intrusive
new file mode 160000
index 0000000000..3b5001f22f
--- /dev/null
+++ b/vendor/boost-submodules/boost-intrusive
@@ -0,0 +1 @@
+Subproject commit 3b5001f22f342e62a6f732b0bc58817a608a752f
diff --git a/vendor/boost-submodules/boost-io b/vendor/boost-submodules/boost-io
new file mode 160000
index 0000000000..5fa66f1f76
--- /dev/null
+++ b/vendor/boost-submodules/boost-io
@@ -0,0 +1 @@
+Subproject commit 5fa66f1f76fb9142765692cc0cf6e40af8d08c45
diff --git a/vendor/boost-submodules/boost-iostreams b/vendor/boost-submodules/boost-iostreams
new file mode 160000
index 0000000000..64abdfc65f
--- /dev/null
+++ b/vendor/boost-submodules/boost-iostreams
@@ -0,0 +1 @@
+Subproject commit 64abdfc65f767c0ecb5256c265ed202039fb2f1a
diff --git a/vendor/boost-submodules/boost-iterator b/vendor/boost-submodules/boost-iterator
new file mode 160000
index 0000000000..814965402e
--- /dev/null
+++ b/vendor/boost-submodules/boost-iterator
@@ -0,0 +1 @@
+Subproject commit 814965402e250c8ceb3883e3b2c6596e0f100f92
diff --git a/vendor/boost-submodules/boost-lexical-cast b/vendor/boost-submodules/boost-lexical-cast
new file mode 160000
index 0000000000..87ce721928
--- /dev/null
+++ b/vendor/boost-submodules/boost-lexical-cast
@@ -0,0 +1 @@
+Subproject commit 87ce72192836787ff7bc8628abf0f0a68d56001d
diff --git a/vendor/boost-submodules/boost-locale b/vendor/boost-submodules/boost-locale
new file mode 160000
index 0000000000..ccb8fbb9a1
--- /dev/null
+++ b/vendor/boost-submodules/boost-locale
@@ -0,0 +1 @@
+Subproject commit ccb8fbb9a1a0dbdffb1054ffa34e4aba1e425642
diff --git a/vendor/boost-submodules/boost-logic b/vendor/boost-submodules/boost-logic
new file mode 160000
index 0000000000..832731f5ab
--- /dev/null
+++ b/vendor/boost-submodules/boost-logic
@@ -0,0 +1 @@
+Subproject commit 832731f5ab57a9b9cb03847fcd31b001fa9314bc
diff --git a/vendor/boost-submodules/boost-math b/vendor/boost-submodules/boost-math
new file mode 160000
index 0000000000..e91bb5ec9d
--- /dev/null
+++ b/vendor/boost-submodules/boost-math
@@ -0,0 +1 @@
+Subproject commit e91bb5ec9dde1f867854d1d78e692ce9d20d10a2
diff --git a/vendor/boost-submodules/boost-move b/vendor/boost-submodules/boost-move
new file mode 160000
index 0000000000..0304ee7581
--- /dev/null
+++ b/vendor/boost-submodules/boost-move
@@ -0,0 +1 @@
+Subproject commit 0304ee7581dda870dbb66c6bd0556a58a1002ca4
diff --git a/vendor/boost-submodules/boost-mp11 b/vendor/boost-submodules/boost-mp11
new file mode 160000
index 0000000000..b23b97856c
--- /dev/null
+++ b/vendor/boost-submodules/boost-mp11
@@ -0,0 +1 @@
+Subproject commit b23b97856c94de25b2909c89d4b8389543defa48
diff --git a/vendor/boost-submodules/boost-mpl b/vendor/boost-submodules/boost-mpl
new file mode 160000
index 0000000000..b440c45c28
--- /dev/null
+++ b/vendor/boost-submodules/boost-mpl
@@ -0,0 +1 @@
+Subproject commit b440c45c2810acbddc917db057f2e5194da1a199
diff --git a/vendor/boost-submodules/boost-multi-index b/vendor/boost-submodules/boost-multi-index
new file mode 160000
index 0000000000..27dd132780
--- /dev/null
+++ b/vendor/boost-submodules/boost-multi-index
@@ -0,0 +1 @@
+Subproject commit 27dd13278095357aadfe4a3a5455f587cac87648
diff --git a/vendor/boost-submodules/boost-numeric-conversion b/vendor/boost-submodules/boost-numeric-conversion
new file mode 160000
index 0000000000..de92292140
--- /dev/null
+++ b/vendor/boost-submodules/boost-numeric-conversion
@@ -0,0 +1 @@
+Subproject commit de922921408bc7116a3c7c67b2fcfbe3e3214f3b
diff --git a/vendor/boost-submodules/boost-optional b/vendor/boost-submodules/boost-optional
new file mode 160000
index 0000000000..a192204b41
--- /dev/null
+++ b/vendor/boost-submodules/boost-optional
@@ -0,0 +1 @@
+Subproject commit a192204b41bd9744d85f202849f860b66fd1c2bc
diff --git a/vendor/boost-submodules/boost-outcome b/vendor/boost-submodules/boost-outcome
new file mode 160000
index 0000000000..7e11febe7a
--- /dev/null
+++ b/vendor/boost-submodules/boost-outcome
@@ -0,0 +1 @@
+Subproject commit 7e11febe7a473e2db41c51b2f47d761083a26e04
diff --git a/vendor/boost-submodules/boost-predef b/vendor/boost-submodules/boost-predef
new file mode 160000
index 0000000000..fe62325d9f
--- /dev/null
+++ b/vendor/boost-submodules/boost-predef
@@ -0,0 +1 @@
+Subproject commit fe62325d9fe171028a1beb61082a72972a3e93b0
diff --git a/vendor/boost-preprocessor b/vendor/boost-submodules/boost-preprocessor
similarity index 100%
rename from vendor/boost-preprocessor
rename to vendor/boost-submodules/boost-preprocessor
diff --git a/vendor/boost-submodules/boost-program-options b/vendor/boost-submodules/boost-program-options
new file mode 160000
index 0000000000..bc0c90a70f
--- /dev/null
+++ b/vendor/boost-submodules/boost-program-options
@@ -0,0 +1 @@
+Subproject commit bc0c90a70f0435ee4ce65b97a68d864a7d627e35
diff --git a/vendor/boost-submodules/boost-property-tree b/vendor/boost-submodules/boost-property-tree
new file mode 160000
index 0000000000..bdfe275d17
--- /dev/null
+++ b/vendor/boost-submodules/boost-property-tree
@@ -0,0 +1 @@
+Subproject commit bdfe275d172ac30bc5e89a6375a5a64dea20b3c0
diff --git a/vendor/boost-submodules/boost-random b/vendor/boost-submodules/boost-random
new file mode 160000
index 0000000000..5d9ba8578a
--- /dev/null
+++ b/vendor/boost-submodules/boost-random
@@ -0,0 +1 @@
+Subproject commit 5d9ba8578ac1d78525488077dafb99b536a399d3
diff --git a/vendor/boost-submodules/boost-range b/vendor/boost-submodules/boost-range
new file mode 160000
index 0000000000..77a4dd5124
--- /dev/null
+++ b/vendor/boost-submodules/boost-range
@@ -0,0 +1 @@
+Subproject commit 77a4dd51242f1ef446acb1a476ae1c760c206b1d
diff --git a/vendor/boost-submodules/boost-ratio b/vendor/boost-submodules/boost-ratio
new file mode 160000
index 0000000000..9688851478
--- /dev/null
+++ b/vendor/boost-submodules/boost-ratio
@@ -0,0 +1 @@
+Subproject commit 96888514780dbe8d1729a8248fbafdeda79bcdc4
diff --git a/vendor/boost-submodules/boost-regex b/vendor/boost-submodules/boost-regex
new file mode 160000
index 0000000000..18e7b8c463
--- /dev/null
+++ b/vendor/boost-submodules/boost-regex
@@ -0,0 +1 @@
+Subproject commit 18e7b8c4635a5042db971e41cebd7889383ea00e
diff --git a/vendor/boost-submodules/boost-serialization b/vendor/boost-submodules/boost-serialization
new file mode 160000
index 0000000000..f01148e421
--- /dev/null
+++ b/vendor/boost-submodules/boost-serialization
@@ -0,0 +1 @@
+Subproject commit f01148e421d2072294a6bc5faf70a5f6d4a709c2
diff --git a/vendor/boost-submodules/boost-smart-ptr b/vendor/boost-submodules/boost-smart-ptr
new file mode 160000
index 0000000000..610f19f247
--- /dev/null
+++ b/vendor/boost-submodules/boost-smart-ptr
@@ -0,0 +1 @@
+Subproject commit 610f19f247f3e728b14836830d683e3d0e6dc9e7
diff --git a/vendor/boost-submodules/boost-static-assert b/vendor/boost-submodules/boost-static-assert
new file mode 160000
index 0000000000..233ef6bedd
--- /dev/null
+++ b/vendor/boost-submodules/boost-static-assert
@@ -0,0 +1 @@
+Subproject commit 233ef6bedd1868437a1c7fb7e7f77c6a1b6e3495
diff --git a/vendor/boost-submodules/boost-system b/vendor/boost-submodules/boost-system
new file mode 160000
index 0000000000..c556aba559
--- /dev/null
+++ b/vendor/boost-submodules/boost-system
@@ -0,0 +1 @@
+Subproject commit c556aba559706b32c5d12a0ccf6b51dba0b548ab
diff --git a/vendor/boost-submodules/boost-thread b/vendor/boost-submodules/boost-thread
new file mode 160000
index 0000000000..042ce47e77
--- /dev/null
+++ b/vendor/boost-submodules/boost-thread
@@ -0,0 +1 @@
+Subproject commit 042ce47e777cf44b11fe6baba02c3531222117f1
diff --git a/vendor/boost-submodules/boost-throw-exception b/vendor/boost-submodules/boost-throw-exception
new file mode 160000
index 0000000000..5143552817
--- /dev/null
+++ b/vendor/boost-submodules/boost-throw-exception
@@ -0,0 +1 @@
+Subproject commit 514355281753b29d3be77d32a1817c5a0d0bd739
diff --git a/vendor/boost-submodules/boost-tokenizer b/vendor/boost-submodules/boost-tokenizer
new file mode 160000
index 0000000000..667a8229bd
--- /dev/null
+++ b/vendor/boost-submodules/boost-tokenizer
@@ -0,0 +1 @@
+Subproject commit 667a8229bd87f1986a49d844582c396dec408d14
diff --git a/vendor/boost-submodules/boost-tti b/vendor/boost-submodules/boost-tti
new file mode 160000
index 0000000000..31736e3dff
--- /dev/null
+++ b/vendor/boost-submodules/boost-tti
@@ -0,0 +1 @@
+Subproject commit 31736e3dff24934430b038b85f794432eb949a29
diff --git a/vendor/boost-submodules/boost-tuple b/vendor/boost-submodules/boost-tuple
new file mode 160000
index 0000000000..fb55aa6d4d
--- /dev/null
+++ b/vendor/boost-submodules/boost-tuple
@@ -0,0 +1 @@
+Subproject commit fb55aa6d4d5e6917f55dbd7aee58afde97879b85
diff --git a/vendor/boost-submodules/boost-type-index b/vendor/boost-submodules/boost-type-index
new file mode 160000
index 0000000000..afd1b6cdc8
--- /dev/null
+++ b/vendor/boost-submodules/boost-type-index
@@ -0,0 +1 @@
+Subproject commit afd1b6cdc88c516d72a6a2f7a7dd3585f7a8f20c
diff --git a/vendor/boost-submodules/boost-type-traits b/vendor/boost-submodules/boost-type-traits
new file mode 160000
index 0000000000..0044e85b4c
--- /dev/null
+++ b/vendor/boost-submodules/boost-type-traits
@@ -0,0 +1 @@
+Subproject commit 0044e85b4c5f7a32b5de33980ecb900a1dbb5fb0
diff --git a/vendor/boost-submodules/boost-unordered b/vendor/boost-submodules/boost-unordered
new file mode 160000
index 0000000000..9abce00f24
--- /dev/null
+++ b/vendor/boost-submodules/boost-unordered
@@ -0,0 +1 @@
+Subproject commit 9abce00f240f4d7b38c335c1f86262e7ea16018d
diff --git a/vendor/boost-submodules/boost-utility b/vendor/boost-submodules/boost-utility
new file mode 160000
index 0000000000..9eeb7f85c5
--- /dev/null
+++ b/vendor/boost-submodules/boost-utility
@@ -0,0 +1 @@
+Subproject commit 9eeb7f85c57b1c7a6d320594f2630c7514c71bed
diff --git a/vendor/boost-submodules/boost-uuid b/vendor/boost-submodules/boost-uuid
new file mode 160000
index 0000000000..ca0185f9f2
--- /dev/null
+++ b/vendor/boost-submodules/boost-uuid
@@ -0,0 +1 @@
+Subproject commit ca0185f9f2f1c8d58af8c54ce24579e1c6ebf348
diff --git a/vendor/boost-submodules/boost-variant b/vendor/boost-submodules/boost-variant
new file mode 160000
index 0000000000..f34376e115
--- /dev/null
+++ b/vendor/boost-submodules/boost-variant
@@ -0,0 +1 @@
+Subproject commit f34376e115329a3196dd19101398500423b72a21
diff --git a/vendor/boost-submodules/boost-winapi b/vendor/boost-submodules/boost-winapi
new file mode 160000
index 0000000000..65b9c99a67
--- /dev/null
+++ b/vendor/boost-submodules/boost-winapi
@@ -0,0 +1 @@
+Subproject commit 65b9c99a6772add56a24272d0b76b611fd92caf4