mirror of
https://github.com/robbert-vdh/yabridge.git
synced 2026-05-16 21:50:11 +02:00
Clean up the Boost/windows.h trickery
I didn't know NOMINMAX was a thing, but that fixes a lot of compile errors.
This commit is contained in:
@@ -16,13 +16,12 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
// Libraries like Boost and bitsery think we're compiling on Windows or using a
|
// Libraries like Boost think we're compiling on Windows or using a MSVC
|
||||||
// MSVC toolchain. This will cause them to make assumptions about the way
|
// toolchain. This will cause them to make incorrect assumptions which platform
|
||||||
// certain types are defined, which headers are available and which features to
|
// specific features are available. The only way around this I could think of
|
||||||
// disable (i.e. POSIX specific features). The only way around this I could
|
// was to just temporarily undefine the macros these libraries use to detect
|
||||||
// think of was to just temporarily undefine the macros these libraries use to
|
// it's running under a WIN32 environment. If anyone knows a better way to do
|
||||||
// detect it's running under a WIN32 environment. If anyone knows a better way
|
// this, please let me know!
|
||||||
// to do this, please let me know!
|
|
||||||
|
|
||||||
#pragma push_macro("WIN32")
|
#pragma push_macro("WIN32")
|
||||||
#pragma push_macro("_WIN32")
|
#pragma push_macro("_WIN32")
|
||||||
@@ -34,13 +33,13 @@
|
|||||||
#undef __WIN32__
|
#undef __WIN32__
|
||||||
#undef _WIN64
|
#undef _WIN64
|
||||||
|
|
||||||
#include <bitsery/bitsery.h>
|
// This would be the minimal include needed to get Bosot to work. The commented
|
||||||
|
// out include below is the actual header that would cause compile errors if not
|
||||||
|
// included here, but including headers from the detail directory directly
|
||||||
|
// didn't sound like a great idea.
|
||||||
|
|
||||||
#include <boost/algorithm/string/predicate.hpp>
|
#include <boost/asio/basic_socket_streambuf.hpp>
|
||||||
#include <boost/asio/io_context.hpp>
|
// #include <boost/asio/detail/timer_queue_ptime.hpp>
|
||||||
#include <boost/asio/local/stream_protocol.hpp>
|
|
||||||
#include <boost/process/environment.hpp>
|
|
||||||
#include <fstream>
|
|
||||||
|
|
||||||
#pragma pop_macro("WIN32")
|
#pragma pop_macro("WIN32")
|
||||||
#pragma pop_macro("_WIN32")
|
#pragma pop_macro("_WIN32")
|
||||||
@@ -16,10 +16,12 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "native-includes.h"
|
#include "boost-fix.h"
|
||||||
|
|
||||||
// `native-includes.h` has to be included before any other files as otherwise we
|
#define NOMINMAX
|
||||||
// might get the wrong version of certain libraries
|
#define NOSERVICE
|
||||||
|
#define NOMCX
|
||||||
|
#define NOIMM
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <vestige/aeffect.h>
|
#include <vestige/aeffect.h>
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user