From 9ce1e18c1f7fe14b49733971216e8dd8d888dc4f Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 17 Oct 2021 22:15:32 +0100 Subject: [PATCH] Move common rack/plugins external repos to new include/ dir Signed-off-by: falkTX --- .gitmodules | 4 ++-- {src => include}/GL/glew.h | 0 {src => include}/mingw-compat/Shlobj.h | 0 {src => include}/mingw-compat/Shlwapi.h | 0 {src => include}/mingw-compat/Windows.h | 0 {src => include}/mingw-compat/condition_variable | 0 {src => include}/mingw-compat/mutex | 0 {src => include}/mingw-compat/thread | 0 {src => include}/mingw-std-threads | 0 {src => include}/neon-compat/pmmintrin.h | 0 {src => include}/sse2neon | 0 plugins/Makefile | 10 +++++++--- src/Makefile | 4 +++- 13 files changed, 12 insertions(+), 6 deletions(-) rename {src => include}/GL/glew.h (100%) rename {src => include}/mingw-compat/Shlobj.h (100%) rename {src => include}/mingw-compat/Shlwapi.h (100%) rename {src => include}/mingw-compat/Windows.h (100%) rename {src => include}/mingw-compat/condition_variable (100%) rename {src => include}/mingw-compat/mutex (100%) rename {src => include}/mingw-compat/thread (100%) rename {src => include}/mingw-std-threads (100%) rename {src => include}/neon-compat/pmmintrin.h (100%) rename {src => include}/sse2neon (100%) diff --git a/.gitmodules b/.gitmodules index e3defc0..d9226cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/src/GL/glew.h b/include/GL/glew.h similarity index 100% rename from src/GL/glew.h rename to include/GL/glew.h diff --git a/src/mingw-compat/Shlobj.h b/include/mingw-compat/Shlobj.h similarity index 100% rename from src/mingw-compat/Shlobj.h rename to include/mingw-compat/Shlobj.h diff --git a/src/mingw-compat/Shlwapi.h b/include/mingw-compat/Shlwapi.h similarity index 100% rename from src/mingw-compat/Shlwapi.h rename to include/mingw-compat/Shlwapi.h diff --git a/src/mingw-compat/Windows.h b/include/mingw-compat/Windows.h similarity index 100% rename from src/mingw-compat/Windows.h rename to include/mingw-compat/Windows.h diff --git a/src/mingw-compat/condition_variable b/include/mingw-compat/condition_variable similarity index 100% rename from src/mingw-compat/condition_variable rename to include/mingw-compat/condition_variable diff --git a/src/mingw-compat/mutex b/include/mingw-compat/mutex similarity index 100% rename from src/mingw-compat/mutex rename to include/mingw-compat/mutex diff --git a/src/mingw-compat/thread b/include/mingw-compat/thread similarity index 100% rename from src/mingw-compat/thread rename to include/mingw-compat/thread diff --git a/src/mingw-std-threads b/include/mingw-std-threads similarity index 100% rename from src/mingw-std-threads rename to include/mingw-std-threads diff --git a/src/neon-compat/pmmintrin.h b/include/neon-compat/pmmintrin.h similarity index 100% rename from src/neon-compat/pmmintrin.h rename to include/neon-compat/pmmintrin.h diff --git a/src/sse2neon b/include/sse2neon similarity index 100% rename from src/sse2neon rename to include/sse2neon diff --git a/plugins/Makefile b/plugins/Makefile index dd18d87..300ee30 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -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 # -------------------------------------------------------------- diff --git a/src/Makefile b/src/Makefile index 3b44f3f..98caeb6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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)