Browse Source

Move common rack/plugins external repos to new include/ dir

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
9ce1e18c1f
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
13 changed files with 12 additions and 6 deletions
  1. +2
    -2
      .gitmodules
  2. +0
    -0
      include/GL/glew.h
  3. +0
    -0
      include/mingw-compat/Shlobj.h
  4. +0
    -0
      include/mingw-compat/Shlwapi.h
  5. +0
    -0
      include/mingw-compat/Windows.h
  6. +0
    -0
      include/mingw-compat/condition_variable
  7. +0
    -0
      include/mingw-compat/mutex
  8. +0
    -0
      include/mingw-compat/thread
  9. +0
    -0
      include/mingw-std-threads
  10. +0
    -0
      include/neon-compat/pmmintrin.h
  11. +0
    -0
      include/sse2neon
  12. +7
    -3
      plugins/Makefile
  13. +3
    -1
      src/Makefile

+ 2
- 2
.gitmodules View File

@@ -5,10 +5,10 @@
path = dpf
url = https://github.com/DISTRHO/DPF.git
[submodule "plugins/Cardinal/mingw-std-threads"]
path = src/mingw-std-threads
path = include/mingw-std-threads
url = https://github.com/meganz/mingw-std-threads.git
[submodule "plugins/Cardinal/sse2neon"]
path = src/sse2neon
path = include/sse2neon
url = https://github.com/DLTcollab/sse2neon.git
[submodule "plugins/Fundamental"]
path = plugins/Fundamental


src/GL/glew.h → include/GL/glew.h View File


src/mingw-compat/Shlobj.h → include/mingw-compat/Shlobj.h View File


src/mingw-compat/Shlwapi.h → include/mingw-compat/Shlwapi.h View File


src/mingw-compat/Windows.h → include/mingw-compat/Windows.h View File


src/mingw-compat/condition_variable → include/mingw-compat/condition_variable View File


src/mingw-compat/mutex → include/mingw-compat/mutex View File


src/mingw-compat/thread → include/mingw-compat/thread View File


src/mingw-std-threads → include/mingw-std-threads View File


src/neon-compat/pmmintrin.h → include/neon-compat/pmmintrin.h View File


src/sse2neon → include/sse2neon View File


+ 7
- 3
plugins/Makefile View File

@@ -180,8 +180,11 @@ BUILD_C_FLAGS += -std=gnu11

BASE_FLAGS += -I../dpf/dgl/src/nanovg
BASE_FLAGS += -I../dpf/distrho

BASE_FLAGS += -I../include
BASE_FLAGS += -I../include/neon-compat

BASE_FLAGS += -I../src
BASE_FLAGS += -I../src/neon-compat
BASE_FLAGS += -I../src/Rack/include
BASE_FLAGS += -I../src/Rack/dep/include
# BASE_FLAGS += -I../src/Rack/dep/filesystem/include
@@ -191,12 +194,13 @@ BASE_FLAGS += -I../src/Rack/dep/nanosvg/src
# BASE_FLAGS += -I../src/Rack/dep/osdialog
BASE_FLAGS += -I../src/Rack/dep/oui-blendish
BASE_FLAGS += -I../src/Rack/dep/pffft

BASE_FLAGS += -pthread

ifeq ($(WINDOWS),true)
BASE_FLAGS += -D_USE_MATH_DEFINES
BASE_FLAGS += -I../src/mingw-compat
BASE_FLAGS += -I../src/mingw-std-threads
BASE_FLAGS += -I../include/mingw-compat
BASE_FLAGS += -I../include/mingw-std-threads
endif

# --------------------------------------------------------------


+ 3
- 1
src/Makefile View File

@@ -92,6 +92,8 @@ endif

BASE_FLAGS += -D_APP_VERSION=Cardinal
BASE_FLAGS += -I../dpf/dgl/src/nanovg
BASE_FLAGS += -I../include
BASE_FLAGS += -I../include/neon-compat
BASE_FLAGS += -IRack/include
BASE_FLAGS += -IRack/dep/include
BASE_FLAGS += -IRack/dep/filesystem/include
@@ -101,7 +103,7 @@ BASE_FLAGS += -IRack/dep/nanosvg/src
BASE_FLAGS += -IRack/dep/osdialog
BASE_FLAGS += -IRack/dep/oui-blendish
BASE_FLAGS += -IRack/dep/pffft
BASE_FLAGS += -Ineon-compat
BASE_FLAGS += -pthread

ifeq ($(WINDOWS),true)


Loading…
Cancel
Save