Browse Source

A few mingw related fixes

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
ce5fd3e745
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
9 changed files with 22 additions and 0 deletions
  1. +3
    -0
      .gitmodules
  2. +6
    -0
      plugins/CVCRack/Makefile
  3. +1
    -0
      plugins/CVCRack/mingw-compat/Shlobj.h
  4. +1
    -0
      plugins/CVCRack/mingw-compat/Shlwapi.h
  5. +1
    -0
      plugins/CVCRack/mingw-compat/Windows.h
  6. +3
    -0
      plugins/CVCRack/mingw-compat/condition_variable
  7. +3
    -0
      plugins/CVCRack/mingw-compat/mutex
  8. +3
    -0
      plugins/CVCRack/mingw-compat/thread
  9. +1
    -0
      plugins/CVCRack/mingw-std-threads

+ 3
- 0
.gitmodules View File

@@ -4,3 +4,6 @@
[submodule "dpf"]
path = dpf
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
- 0
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/libjansson.a
EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a
EXTRA_LIBS += Rack/dep/lib/libzstd.a

ifeq ($(WINDOWS),true)
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/pffft

ifeq ($(WINDOWS),true)
BASE_FLAGS += -Imingw-compat
BUILD_CXX_FLAGS += -Imingw-std-threads
endif

ifeq ($(MACOS),true)
BASE_FLAGS += -DARCH_MAC
else ifeq ($(WINDOWS),true)


+ 1
- 0
plugins/CVCRack/mingw-compat/Shlobj.h View File

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

+ 1
- 0
plugins/CVCRack/mingw-compat/Shlwapi.h View File

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

+ 1
- 0
plugins/CVCRack/mingw-compat/Windows.h View File

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

+ 3
- 0
plugins/CVCRack/mingw-compat/condition_variable View File

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

+ 3
- 0
plugins/CVCRack/mingw-compat/mutex View File

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

+ 3
- 0
plugins/CVCRack/mingw-compat/thread View File

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

+ 1
- 0
plugins/CVCRack/mingw-std-threads

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

Loading…
Cancel
Save