mirror of
https://github.com/robbert-vdh/yabridge.git
synced 2026-05-14 20:40:03 +02:00
Don't set __MINGW32__
This took me a few hours of non-stop headaches to figure out. Apparently deep inside of Wine's headers having __MINGW32__ defined will cause some GUIDs to be defined slightly differently. This normally wouldn't cause issues, but when including `shellobj.h` or `objbase.h` this results in multiple definition linking errors that are basically impossible to diagnose.
This commit is contained in:
@@ -23,13 +23,11 @@
|
||||
// it's running under a WIN32 environment. If anyone knows a better way to do
|
||||
// this, please let me know!
|
||||
|
||||
#pragma push_macro("__MINGW32__")
|
||||
#pragma push_macro("WIN32")
|
||||
#pragma push_macro("_WIN32")
|
||||
#pragma push_macro("__WIN32__")
|
||||
#pragma push_macro("_WIN64")
|
||||
|
||||
#undef __MINGW32__
|
||||
#undef WIN32
|
||||
#undef _WIN32
|
||||
#undef __WIN32__
|
||||
@@ -44,7 +42,6 @@
|
||||
#include <boost/asio/basic_socket_streambuf.hpp>
|
||||
// #include <boost/asio/detail/timer_queue_ptime.hpp>
|
||||
|
||||
#pragma pop_macro("__MINGW32__")
|
||||
#pragma pop_macro("WIN32")
|
||||
#pragma pop_macro("_WIN32")
|
||||
#pragma pop_macro("__WIN32__")
|
||||
|
||||
@@ -20,10 +20,6 @@
|
||||
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#define NOSERVICE
|
||||
#define NOMCX
|
||||
#define NOIMM
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
#include <vestige/aeffectx.h>
|
||||
#include <windows.h>
|
||||
|
||||
@@ -22,10 +22,6 @@
|
||||
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#define NOSERVICE
|
||||
#define NOMCX
|
||||
#define NOIMM
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
#include <vestige/aeffectx.h>
|
||||
#include <windows.h>
|
||||
|
||||
@@ -23,10 +23,6 @@
|
||||
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#define NOSERVICE
|
||||
#define NOMCX
|
||||
#define NOIMM
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
#include <windows.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user