Skip to content

Commit 4fe6b20

Browse files
committed
Remove mingw
1 parent 525e13f commit 4fe6b20

29 files changed

+49
-473
lines changed

.github/workflows/build_mingw.yml

Lines changed: 0 additions & 159 deletions
This file was deleted.

cmake/yup.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ function (_yup_setup_platform)
6262
list (APPEND platforms "windows" "msft" "desktop")
6363
endif()
6464

65-
if (MINGW)
66-
list (APPEND platforms "mingw")
67-
elseif (MSVC)
68-
list (APPEND platforms "msvc")
69-
endif()
70-
7165
elseif (UNIX)
7266
set (platform "linux")
7367
list (APPEND platforms "linux" "posix" "desktop")

cmake/yup_modules.cmake

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,7 @@ function (_yup_module_setup_target module_name
175175
module_arc_enabled)
176176
if (YUP_PLATFORM_MSFT)
177177
list (APPEND module_defines NOMINMAX=1 WIN32_LEAN_AND_MEAN=1)
178-
if (MINGW)
179-
list (APPEND module_options -Wa,-mbig-obj)
180-
elseif (MSVC)
181-
list (APPEND module_options /bigobj)
182-
endif()
178+
list (APPEND module_options /bigobj)
183179
endif()
184180

185181
target_sources (${module_name} INTERFACE ${module_sources})
@@ -482,35 +478,21 @@ function (yup_add_module module_path module_group)
482478
set (module_cpp_standard "${module_msftCppStandard}")
483479
endif()
484480
list (APPEND module_libs ${module_msftLibs})
481+
list (APPEND module_libs ${module_windowsLibs})
485482
list (APPEND module_dependencies ${module_msftDeps})
483+
list (APPEND module_dependencies ${module_windowsDeps})
486484
list (APPEND module_defines ${module_msftDefines})
485+
list (APPEND module_defines ${module_windowsDefines})
487486
list (APPEND module_options ${module_msftOptions})
487+
list (APPEND module_options ${module_windowsOptions})
488488
list (APPEND module_link_options ${module_msftLinkOptions})
489+
list (APPEND module_link_options ${module_windowsLinkOptions})
489490
_yup_resolve_variable_paths ("${module_msftSearchpaths}" module_msftSearchpaths)
490491
list (APPEND module_searchpaths ${module_msftSearchpaths})
491-
492-
if (MINGW)
493-
list (APPEND module_libs ${module_mingwLibs})
494-
list (APPEND module_dependencies ${module_mingwDeps})
495-
list (APPEND module_defines ${module_mingwDefines})
496-
list (APPEND module_options ${module_mingwOptions})
497-
list (APPEND module_link_options ${module_mingwLinkOptions})
498-
_yup_resolve_variable_paths ("${module_mingwSearchpaths}" module_mingwSearchpaths)
499-
list (APPEND module_searchpaths ${module_mingwSearchpaths})
500-
if (module_mingwCppStandard)
501-
set (module_cpp_standard "${module_mingwCppStandard}")
502-
endif()
503-
else()
504-
list (APPEND module_libs ${module_windowsLibs})
505-
list (APPEND module_dependencies ${module_windowsDeps})
506-
list (APPEND module_defines ${module_windowsDefines})
507-
list (APPEND module_options ${module_windowsOptions})
508-
list (APPEND module_link_options ${module_windowsLinkOptions})
509-
_yup_resolve_variable_paths ("${module_windowsSearchpaths}" module_windowsSearchpaths)
510-
list (APPEND module_searchpaths ${module_windowsSearchpaths})
511-
if (module_windowsCppStandard)
512-
set (module_cpp_standard "${module_windowsCppStandard}")
513-
endif()
492+
_yup_resolve_variable_paths ("${module_windowsSearchpaths}" module_windowsSearchpaths)
493+
list (APPEND module_searchpaths ${module_windowsSearchpaths})
494+
if (module_windowsCppStandard)
495+
set (module_cpp_standard "${module_windowsCppStandard}")
514496
endif()
515497
endif()
516498

docs/YUP Module Format.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ In order to specify that a source file should only be compiled for a specific pl
5151
_msft <- compiled for Microsoft platforms only
5252
_uwp <- compiled for Universal Windows Platform only
5353
_windows <- compiled for Windows desktop only (MSVC)
54-
_mingw <- compiled for Windows desktop only (MinGW)
5554
_linux <- compiled for Linux and FreeBSD only
5655
_android <- compiled for Android only
5756
_posix <- compiled for Posix platforms only
@@ -71,7 +70,7 @@ To simplify the use of obj-C++ there's also a special-case rule: If the folder c
7170

7271
### Precompiled libraries
7372

74-
Precompiled libraries can be included in a module by placing them in a libs/ subdirectory. The following directories are automatically added to the library search paths, and libraries placed in these directories can be linked with projects via the OSXLibs, iOSLibs, windowsLibs, linuxLibs and mingwLibs keywords in the module declaration (see the following section).
73+
Precompiled libraries can be included in a module by placing them in a libs/ subdirectory. The following directories are automatically added to the library search paths, and libraries placed in these directories can be linked with projects via the OSXLibs, iOSLibs, windowsLibs and linuxLibs keywords in the module declaration (see the following section).
7574

7675
- OS X
7776
- libs/MacOSX - to support multiple architectures, you may place libraries built as universal binaries at this location. When building with CMake, only libraries built as universal binaries are supported and the arch subfolders are ignored.
@@ -138,25 +137,25 @@ Possible values:
138137
- searchpaths
139138
- (Optional) A space-separated list of internal include paths, relative to the module's parent folder, which need to be added to a project's header search path.
140139

141-
- [android|apple|ios|linux|mingw|mobile|msft|osx|wasm|win32|windows]CppStandard
140+
- [android|apple|ios|linux|mobile|msft|osx|wasm|win32|windows]CppStandard
142141
- (Optional) A number indicating the minimum C++ language standard that is required for this module and this platform exclusively. This must be just the standard number with no prefix e.g. 20 for C++20.
143142

144-
- [android|apple|ios|linux|mingw|mobile|msft|osx|wasm|win32|windows]Deps
143+
- [android|apple|ios|linux|mobile|msft|osx|wasm|win32|windows]Deps
145144
- (Optional) A list (space or comma-separated) of other modules that are required by this one.
146145

147-
- [android|apple|ios|linux|mingw|mobile|msft|osx|wasm|win32|windows]Defines
146+
- [android|apple|ios|linux|mobile|msft|osx|wasm|win32|windows]Defines
148147
- (Optional) A list (space or comma-separated) of macro defines needed by this module in a build.
149148

150-
- [android|apple|ios|linux|mingw|mobile|msft|osx|wasm|win32|windows]Libs
149+
- [android|apple|ios|linux|mobile|msft|osx|wasm|win32|windows]Libs
151150
- (Optional) A list (space or comma-separated) of static or dynamic libs that should be linked in a build (these are passed to the linker via the -l flag).
152151

153-
- [android|apple|ios|linux|mingw|mobile|msft|osx|wasm|win32|windows]Options
152+
- [android|apple|ios|linux|mobile|msft|osx|wasm|win32|windows]Options
154153
- (Optional) A list (space or comma-separated) of compile options needed by this module in a build.
155154

156-
- [android|apple|ios|linux|mingw|mobile|msft|osx|wasm|win32|windows]LinkOptions
155+
- [android|apple|ios|linux|mobile|msft|osx|wasm|win32|windows]LinkOptions
157156
- (Optional) A list (space or comma-separated) of link options needed by this module in a build.
158157

159-
- [android|apple|ios|linux|mingw|mobile|msft|osx|wasm|win32|windows]Searchpaths
158+
- [android|apple|ios|linux|mobile|msft|osx|wasm|win32|windows]Searchpaths
160159
- (Optional) A space-separated list of internal include paths, relative to the module's parent folder, which need to be added to a project's header search path.
161160

162161
- [ios|osx|apple]Frameworks
@@ -184,6 +183,5 @@ Here's an example block:
184183
osxFrameworks: CoreAudio CoreMIDI DiscRecording
185184
iosFrameworks: CoreAudio CoreMIDI AudioToolbox AVFoundation
186185
linuxLibs: asound
187-
mingwLibs: winmm
188186

189187
END_YUP_MODULE_DECLARATION

modules/yup_audio_basics/midi/ump/yup_UMPDispatcher.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,7 @@ class BytestreamToUMPDispatcher
126126
{
127127
using CallbackPtr = decltype (std::addressof (callback));
128128

129-
#if YUP_MINGW
130-
#define YUP_MINGW_HIDDEN_VISIBILITY __attribute__ ((visibility ("hidden")))
131-
#else
132-
#define YUP_MINGW_HIDDEN_VISIBILITY
133-
#endif
134-
135-
struct YUP_MINGW_HIDDEN_VISIBILITY Callback
129+
struct Callback
136130
{
137131
Callback (BytestreamToUMPDispatcher& d, CallbackPtr c)
138132
: dispatch (d)
@@ -154,8 +148,6 @@ class BytestreamToUMPDispatcher
154148
CallbackPtr callbackPtr = nullptr;
155149
};
156150

157-
#undef YUP_MINGW_HIDDEN_VISIBILITY
158-
159151
Callback inputCallback { *this, &callback };
160152
concatenator.pushMidiData (begin, int (end - begin), timestamp, (void*) nullptr, inputCallback);
161153
}

modules/yup_audio_basics/yup_audio_basics.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@
5050

5151
#include "yup_audio_basics.h"
5252

53-
#if YUP_MINGW && ! defined(alloca)
54-
#define alloca __builtin_alloca
55-
#endif
56-
5753
#if YUP_USE_SSE_INTRINSICS
5854
#include <emmintrin.h>
5955
#endif

modules/yup_audio_basics/yup_audio_basics.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@
6868
#undef Factor
6969

7070
//==============================================================================
71-
#if YUP_MINGW && ! defined(__SSE2__)
72-
#define YUP_USE_SSE_INTRINSICS 0
73-
#endif
74-
7571
#ifndef YUP_USE_SSE_INTRINSICS
7672
#define YUP_USE_SSE_INTRINSICS 1
7773
#endif

modules/yup_audio_devices/native/yup_ASIO_windows.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,18 +1196,14 @@ class ASIOAudioIODevice final : public AudioIODevice
11961196

11971197
if (asioObject != nullptr)
11981198
{
1199-
#if ! YUP_MINGW
12001199
__try
1201-
#endif
12021200
{
12031201
asioObject->Release();
12041202
}
1205-
#if ! YUP_MINGW
12061203
__except (EXCEPTION_EXECUTE_HANDLER)
12071204
{
12081205
releasedOK = false;
12091206
}
1210-
#endif
12111207

12121208
asioObject = nullptr;
12131209
}
@@ -1231,19 +1227,15 @@ class ASIOAudioIODevice final : public AudioIODevice
12311227

12321228
bool tryCreatingDriver (bool& crashed)
12331229
{
1234-
#if ! YUP_MINGW
12351230
__try
1236-
#endif
12371231
{
12381232
return CoCreateInstance (classId, 0, CLSCTX_INPROC_SERVER, classId, (void**) &asioObject) == S_OK;
12391233
}
1240-
#if ! YUP_MINGW
12411234
__except (EXCEPTION_EXECUTE_HANDLER)
12421235
{
12431236
crashed = true;
12441237
}
12451238
return false;
1246-
#endif
12471239
}
12481240

12491241
String getLastDriverError() const

modules/yup_audio_devices/native/yup_Midi_windows.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,15 +1887,13 @@ struct WinRTMidiService final : public MidiServiceType
18871887

18881888
//==============================================================================
18891889
//==============================================================================
1890-
#if ! YUP_MINGW
18911890
extern RTL_OSVERSIONINFOW getWindowsVersionInfo();
1892-
#endif
18931891

18941892
struct MidiService final : public DeletedAtShutdown
18951893
{
18961894
MidiService()
18971895
{
1898-
#if YUP_USE_WINRT_MIDI && ! YUP_MINGW
1896+
#if YUP_USE_WINRT_MIDI
18991897
#if ! YUP_FORCE_WINRT_MIDI
19001898
auto windowsVersionInfo = getWindowsVersionInfo();
19011899
if (windowsVersionInfo.dwMajorVersion >= 10 && windowsVersionInfo.dwBuildNumber >= 17763)

0 commit comments

Comments
 (0)