merge conflict

Wasted-Audio · Jan 20, 2025 · b264e3c · b264e3c
2 parents 03d7b8f + 48a87af
commit b264e3c
Show file tree

Hide file tree

Showing 169 changed files with 354 additions and 91,541 deletions.
diff --git a/Libraries/CMakeLists.txt b/Libraries/CMakeLists.txt
@@ -393,6 +393,8 @@ list(APPEND SFONT_INCLUDES
 
 add_library(fluidlite STATIC ${SFONT_SOURCES})
 target_include_directories(fluidlite PRIVATE ${SFONT_INCLUDES})
+target_include_directories(fluidlite PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/pd-else/Source/Audio/sfont~)
+
 if(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
 target_compile_options(fluidlite PRIVATE -Wno-compound-token-split-by-macro)
 endif()

diff --git a/Libraries/FluidLite/.gitignore b/Libraries/FluidLite/.gitignore
diff --git a/Libraries/FluidLite/.travis.yml b/Libraries/FluidLite/.travis.yml
diff --git a/Libraries/FluidLite/CMakeLists.txt b/Libraries/FluidLite/CMakeLists.txt
diff --git a/Libraries/FluidLite/LICENSE b/Libraries/FluidLite/LICENSE