From 57cea708dc0f8bed7539ab8012282957b1327085 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 22 Apr 2023 19:41:20 +0200 Subject: [PATCH] Remove use of mingw-std-threads Signed-off-by: falkTX --- .gitmodules | 3 --- deps/Makefile | 1 - include/mingw-compat/condition_variable | 26 ------------------------- include/mingw-compat/future | 26 ------------------------- include/mingw-compat/mutex | 26 ------------------------- include/mingw-compat/thread | 26 ------------------------- include/mingw-std-threads | 1 - plugins/Makefile | 1 - src/Makefile | 1 - src/Makefile.cardinal.mk | 1 - 10 files changed, 112 deletions(-) delete mode 100644 include/mingw-compat/condition_variable delete mode 100644 include/mingw-compat/future delete mode 100644 include/mingw-compat/mutex delete mode 100644 include/mingw-compat/thread delete mode 160000 include/mingw-std-threads diff --git a/.gitmodules b/.gitmodules index 9c81337..6241e86 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "dpf"] path = dpf url = https://github.com/DISTRHO/DPF.git -[submodule "plugins/Cardinal/mingw-std-threads"] - path = include/mingw-std-threads - url = https://github.com/meganz/mingw-std-threads.git [submodule "plugins/Befaco"] path = plugins/Befaco url = https://github.com/VCVRack/Befaco.git diff --git a/deps/Makefile b/deps/Makefile index 74f2981..60f1155 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -57,7 +57,6 @@ BASE_FLAGS += -D_USE_MATH_DEFINES BASE_FLAGS += -DWIN32_LEAN_AND_MEAN BASE_FLAGS += -D_WIN32_WINNT=0x0600 BASE_FLAGS += -I$(abspath ../include/mingw-compat) -BASE_FLAGS += -I$(abspath ../include/mingw-std-threads) endif BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing diff --git a/include/mingw-compat/condition_variable b/include/mingw-compat/condition_variable deleted file mode 100644 index 270d7d4..0000000 --- a/include/mingw-compat/condition_variable +++ /dev/null @@ -1,26 +0,0 @@ -/* - * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho - * - * 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 3 of - * the License, or 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. - * - * For a full copy of the GNU General Public License see the LICENSE file. - */ - -#pragma once -#include_next -#include "mingw.condition_variable.h" - -// fix macro pollution from Windows headers -#undef IN -#undef OUT -#undef far -#undef near diff --git a/include/mingw-compat/future b/include/mingw-compat/future deleted file mode 100644 index e2cffc7..0000000 --- a/include/mingw-compat/future +++ /dev/null @@ -1,26 +0,0 @@ -/* - * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho - * - * 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 3 of - * the License, or 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. - * - * For a full copy of the GNU General Public License see the LICENSE file. - */ - -#pragma once -#include_next -#include "mingw.future.h" - -// fix macro pollution from Windows headers -#undef IN -#undef OUT -#undef far -#undef near diff --git a/include/mingw-compat/mutex b/include/mingw-compat/mutex deleted file mode 100644 index 15df44a..0000000 --- a/include/mingw-compat/mutex +++ /dev/null @@ -1,26 +0,0 @@ -/* - * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho - * - * 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 3 of - * the License, or 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. - * - * For a full copy of the GNU General Public License see the LICENSE file. - */ - -#pragma once -#include_next -#include "mingw.mutex.h" - -// fix macro pollution from Windows headers -#undef IN -#undef OUT -#undef far -#undef near diff --git a/include/mingw-compat/thread b/include/mingw-compat/thread deleted file mode 100644 index 3b2a63c..0000000 --- a/include/mingw-compat/thread +++ /dev/null @@ -1,26 +0,0 @@ -/* - * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho - * - * 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 3 of - * the License, or 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. - * - * For a full copy of the GNU General Public License see the LICENSE file. - */ - -#pragma once -#include_next -#include "mingw.thread.h" - -// fix macro pollution from Windows headers -#undef IN -#undef OUT -#undef far -#undef near diff --git a/include/mingw-std-threads b/include/mingw-std-threads deleted file mode 160000 index f6365f9..0000000 --- a/include/mingw-std-threads +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f6365f900fb9b1cd6014c8d1cf13ceacf8faf3de diff --git a/plugins/Makefile b/plugins/Makefile index e8d5288..68f56a6 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1356,7 +1356,6 @@ BASE_FLAGS += -D_USE_MATH_DEFINES BASE_FLAGS += -DWIN32_LEAN_AND_MEAN BASE_FLAGS += -D_WIN32_WINNT=0x0600 BASE_FLAGS += -I../include/mingw-compat -BASE_FLAGS += -I../include/mingw-std-threads endif ifeq ($(USE_GLES2),true) diff --git a/src/Makefile b/src/Makefile index ff4ba7b..c9e1d0d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -119,7 +119,6 @@ BASE_FLAGS += -D_USE_MATH_DEFINES BASE_FLAGS += -DWIN32_LEAN_AND_MEAN BASE_FLAGS += -D_WIN32_WINNT=0x0600 BASE_FLAGS += -I../include/mingw-compat -BASE_FLAGS += -I../include/mingw-std-threads endif ifeq ($(USE_GLES2),true) diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 9598e58..5744af7 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -338,7 +338,6 @@ BASE_FLAGS += -D_USE_MATH_DEFINES BASE_FLAGS += -DWIN32_LEAN_AND_MEAN BASE_FLAGS += -D_WIN32_WINNT=0x0600 BASE_FLAGS += -I../../include/mingw-compat -BASE_FLAGS += -I../../include/mingw-std-threads endif ifeq ($(USE_GLES2),true)