diff options
author | Shauren <shauren.trinity@gmail.com> | 2021-08-31 13:46:17 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-08-31 13:46:17 +0200 |
commit | 6ad58d604a63bacc13ee92c525189931d41d1e91 (patch) | |
tree | 72db26708067726a93b3106e97d65ad4005ac7c3 | |
parent | bec81b1d7bb9d501da6ea94e8a98e594691854ec (diff) |
Core/Misc: Fix windows nopch build
Closes #25363
-rw-r--r-- | src/common/Hacks/boost_1_73_process_windows_nopch.h | 30 | ||||
-rw-r--r-- | src/common/Utilities/StartProcess.cpp | 3 |
2 files changed, 33 insertions, 0 deletions
diff --git a/src/common/Hacks/boost_1_73_process_windows_nopch.h b/src/common/Hacks/boost_1_73_process_windows_nopch.h new file mode 100644 index 00000000000..7d5bcec3d68 --- /dev/null +++ b/src/common/Hacks/boost_1_73_process_windows_nopch.h @@ -0,0 +1,30 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef boost_1_73_process_windows_nopch_h__ +#define boost_1_73_process_windows_nopch_h__ + +#include "CompilerDefs.h" +#include <boost/version.hpp> + +#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS && BOOST_VERSION >= 107300 +// __kernel_entry for boost/process/detail/windows/handle_workaround.hpp +// DWORD for boost/process/detail/windows/handles.hpp +#include <windows.h> +#endif + +#endif // boost_1_73_process_windows_nopch_h__ diff --git a/src/common/Utilities/StartProcess.cpp b/src/common/Utilities/StartProcess.cpp index 20be864ea1f..0665e2644bf 100644 --- a/src/common/Utilities/StartProcess.cpp +++ b/src/common/Utilities/StartProcess.cpp @@ -20,6 +20,9 @@ #include "Log.h" #include "Optional.h" #include "Util.h" + +#include "Hacks/boost_1_73_process_windows_nopch.h" + #include <boost/algorithm/string/join.hpp> #include <boost/iostreams/copy.hpp> #include <boost/process/args.hpp> |