brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A few mingw related fixes

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-10-07 13:50:38 +01:00
parent 6700c10148
commit ce5fd3e745
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
9 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,3 +4,6 @@
[submodule "dpf"] [submodule "dpf"]
path = dpf path = dpf
url = https://github.com/DISTRHO/DPF.git url = https://github.com/DISTRHO/DPF.git
[submodule "plugins/CVCRack/mingw-std-threads"]
path = plugins/CVCRack/mingw-std-threads
url = https://github.com/meganz/mingw-std-threads.git

6
plugins/CVCRack/Makefile
View file

@ -52,6 +52,7 @@ FILES_DSP += $(wildcard Rack/src/*/*.cpp)
EXTRA_LIBS += Rack/dep/lib/libglfw3.a EXTRA_LIBS += Rack/dep/lib/libglfw3.a
EXTRA_LIBS += Rack/dep/lib/libjansson.a EXTRA_LIBS += Rack/dep/lib/libjansson.a
EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a
EXTRA_LIBS += Rack/dep/lib/libzstd.a
ifeq ($(WINDOWS),true) ifeq ($(WINDOWS),true)
EXTRA_LIBS += Rack/dep/lib/libarchive_static.a EXTRA_LIBS += Rack/dep/lib/libarchive_static.a
@ -90,6 +91,11 @@ BASE_FLAGS += -IRack/dep/osdialog
BASE_FLAGS += -IRack/dep/oui-blendish BASE_FLAGS += -IRack/dep/oui-blendish
BASE_FLAGS += -IRack/dep/pffft BASE_FLAGS += -IRack/dep/pffft
ifeq ($(WINDOWS),true)
BASE_FLAGS += -Imingw-compat
BUILD_CXX_FLAGS += -Imingw-std-threads
endif
ifeq ($(MACOS),true) ifeq ($(MACOS),true)
BASE_FLAGS += -DARCH_MAC BASE_FLAGS += -DARCH_MAC
else ifeq ($(WINDOWS),true) else ifeq ($(WINDOWS),true)

1
plugins/CVCRack/mingw-compat/Shlobj.h Normal file
View file

@ -0,0 +1 @@
#include <shlobj.h>

1
plugins/CVCRack/mingw-compat/Shlwapi.h Normal file
View file

@ -0,0 +1 @@
#include <shlwapi.h>

1
plugins/CVCRack/mingw-compat/Windows.h Normal file
View file

@ -0,0 +1 @@
#include <windows.h>

3
plugins/CVCRack/mingw-compat/condition_variable Normal file
View file

@ -0,0 +1,3 @@
#pragma once
#include_next <condition_variable>
#include "mingw.condition_variable.h"

3
plugins/CVCRack/mingw-compat/mutex Normal file
View file

@ -0,0 +1,3 @@
#pragma once
#include_next <mutex>
#include "mingw.mutex.h"

3
plugins/CVCRack/mingw-compat/thread Normal file
View file

@ -0,0 +1,3 @@
#pragma once
#include_next <thread>
#include "mingw.thread.h"

1
plugins/CVCRack/mingw-std-threads Submodule

@ -0,0 +1 @@
Subproject commit f6365f900fb9b1cd6014c8d1cf13ceacf8faf3de