diff --git a/plugins/editor/CMakeLists.txt b/plugins/editor/CMakeLists.txt index 4d5d5203..0d939d09 100644 --- a/plugins/editor/CMakeLists.txt +++ b/plugins/editor/CMakeLists.txt @@ -34,6 +34,7 @@ add_library(sfizz_editor STATIC EXCLUDE_FROM_ALL src/editor/EditIds.cpp src/editor/Editor.h src/editor/Editor.cpp + src/editor/EditorLibs.h src/editor/EditorLibs.cpp src/editor/EditorController.h src/editor/GUIComponents.h @@ -50,7 +51,7 @@ add_library(sfizz_editor STATIC EXCLUDE_FROM_ALL src/editor/utility/vstgui_after.h src/editor/utility/vstgui_before.h) add_library(sfizz::editor ALIAS sfizz_editor) -target_include_directories(sfizz_editor PUBLIC "src" "external") +target_include_directories(sfizz_editor PUBLIC "src") target_link_libraries(sfizz_editor PUBLIC sfizz::messaging sfizz::plugins-common) target_link_libraries(sfizz_editor PRIVATE sfizz::vstgui) if(APPLE) @@ -71,6 +72,10 @@ add_library(sfizz_colorspaces INTERFACE) add_library(sfizz::colorspaces ALIAS sfizz_colorspaces) target_include_directories(sfizz_colorspaces INTERFACE "external/color-spaces") +add_library(sfizz_stb_image INTERFACE) +add_library(sfizz::stb_image ALIAS sfizz_stb_image) +target_include_directories(sfizz_stb_image INTERFACE "external/stb_image") + if(WIN32) # elseif(APPLE) @@ -81,7 +86,7 @@ else() target_include_directories(sfizz_editor PRIVATE ${sfizz-gio_INCLUDE_DIRS}) target_link_libraries(sfizz_editor PRIVATE ${sfizz-gio_LIBRARIES}) endif() -target_link_libraries(sfizz_editor PRIVATE sfizz::colorspaces sfizz::bit_array sfizz::filesystem) +target_link_libraries(sfizz_editor PRIVATE sfizz::colorspaces sfizz::stb_image sfizz::bit_array sfizz::filesystem) # layout tool if(NOT CMAKE_CROSSCOMPILING) diff --git a/plugins/editor/src/editor/Editor.cpp b/plugins/editor/src/editor/Editor.cpp index 8a0ae2be..df3b00a6 100644 --- a/plugins/editor/src/editor/Editor.cpp +++ b/plugins/editor/src/editor/Editor.cpp @@ -6,6 +6,7 @@ #include "Editor.h" #include "EditorController.h" +#include "EditorLibs.h" #include "EditIds.h" #include "GUIComponents.h" #include "GUIHelpers.h" @@ -18,9 +19,6 @@ #include #include #include - -#include - #include #include #include diff --git a/plugins/editor/src/editor/EditorLibs.cpp b/plugins/editor/src/editor/EditorLibs.cpp index 920a824c..af8e9d17 100644 --- a/plugins/editor/src/editor/EditorLibs.cpp +++ b/plugins/editor/src/editor/EditorLibs.cpp @@ -1,2 +1,8 @@ +// SPDX-License-Identifier: BSD-2-Clause + +// This code is part of the sfizz library and is licensed under a BSD 2-clause +// license. You should have receive a LICENSE.md file along with the code. +// If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz + #define STB_IMAGE_IMPLEMENTATION -#include +#include "EditorLibs.h" diff --git a/plugins/editor/src/editor/EditorLibs.h b/plugins/editor/src/editor/EditorLibs.h new file mode 100644 index 00000000..ecd11f18 --- /dev/null +++ b/plugins/editor/src/editor/EditorLibs.h @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: BSD-2-Clause + +// This code is part of the sfizz library and is licensed under a BSD 2-clause +// license. You should have receive a LICENSE.md file along with the code. +// If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz + +#pragma once +#include