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

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

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-10-17 22:15:32 +01:00
parent 5efc37e15c
commit 9ce1e18c1f
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
13 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

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

0
src/GL/glew.h → include/GL/glew.h
View file

0
src/mingw-compat/Shlobj.h → include/mingw-compat/Shlobj.h
View file

0
src/mingw-compat/Shlwapi.h → include/mingw-compat/Shlwapi.h
View file

0
src/mingw-compat/Windows.h → include/mingw-compat/Windows.h
View file

0
src/mingw-compat/condition_variable → include/mingw-compat/condition_variable
View file

0
src/mingw-compat/mutex → include/mingw-compat/mutex
View file

0
src/mingw-compat/thread → include/mingw-compat/thread
View file

0
src/mingw-std-threads → include/mingw-std-threads
View file

0
src/neon-compat/pmmintrin.h → include/neon-compat/pmmintrin.h
View file

0
src/sse2neon → include/sse2neon
View file

10
plugins/Makefile
View file

@ -180,8 +180,11 @@ BUILD_C_FLAGS += -std=gnu11
BASE_FLAGS += -I../dpf/dgl/src/nanovg BASE_FLAGS += -I../dpf/dgl/src/nanovg
BASE_FLAGS += -I../dpf/distrho BASE_FLAGS += -I../dpf/distrho
BASE_FLAGS += -I../include
BASE_FLAGS += -I../include/neon-compat
BASE_FLAGS += -I../src BASE_FLAGS += -I../src
BASE_FLAGS += -I../src/neon-compat
BASE_FLAGS += -I../src/Rack/include BASE_FLAGS += -I../src/Rack/include
BASE_FLAGS += -I../src/Rack/dep/include BASE_FLAGS += -I../src/Rack/dep/include
# BASE_FLAGS += -I../src/Rack/dep/filesystem/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/osdialog
BASE_FLAGS += -I../src/Rack/dep/oui-blendish BASE_FLAGS += -I../src/Rack/dep/oui-blendish
BASE_FLAGS += -I../src/Rack/dep/pffft BASE_FLAGS += -I../src/Rack/dep/pffft
BASE_FLAGS += -pthread BASE_FLAGS += -pthread
ifeq ($(WINDOWS),true) ifeq ($(WINDOWS),true)
BASE_FLAGS += -D_USE_MATH_DEFINES BASE_FLAGS += -D_USE_MATH_DEFINES
BASE_FLAGS += -I../src/mingw-compat BASE_FLAGS += -I../include/mingw-compat
BASE_FLAGS += -I../src/mingw-std-threads BASE_FLAGS += -I../include/mingw-std-threads
endif endif
# -------------------------------------------------------------- # --------------------------------------------------------------

4
src/Makefile
View file

@ -92,6 +92,8 @@ endif
BASE_FLAGS += -D_APP_VERSION=Cardinal BASE_FLAGS += -D_APP_VERSION=Cardinal
BASE_FLAGS += -I../dpf/dgl/src/nanovg BASE_FLAGS += -I../dpf/dgl/src/nanovg
BASE_FLAGS += -I../include
BASE_FLAGS += -I../include/neon-compat
BASE_FLAGS += -IRack/include BASE_FLAGS += -IRack/include
BASE_FLAGS += -IRack/dep/include BASE_FLAGS += -IRack/dep/include
BASE_FLAGS += -IRack/dep/filesystem/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/osdialog
BASE_FLAGS += -IRack/dep/oui-blendish BASE_FLAGS += -IRack/dep/oui-blendish
BASE_FLAGS += -IRack/dep/pffft BASE_FLAGS += -IRack/dep/pffft
BASE_FLAGS += -Ineon-compat
BASE_FLAGS += -pthread BASE_FLAGS += -pthread
ifeq ($(WINDOWS),true) ifeq ($(WINDOWS),true)