diff --git a/submodules/0001-VST3-publicsdk_TargetReduction.patch b/submodules/0001-VST3-publicsdk_TargetReduction.patch new file mode 100644 index 000000000..b566426e4 --- /dev/null +++ b/submodules/0001-VST3-publicsdk_TargetReduction.patch @@ -0,0 +1,112 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f4fc61..12071d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -130,56 +130,56 @@ if(SMTG_MAC AND XCODE AND SMTG_IOS_DEVELOPMENT_TEAM) + ) + endif(SMTG_MAC AND XCODE AND SMTG_IOS_DEVELOPMENT_TEAM) + +-#--for hosting---------------- +-add_library(sdk_hosting +- STATIC +- source/vst/hosting/connectionproxy.cpp +- source/vst/hosting/connectionproxy.h +- source/vst/hosting/eventlist.cpp +- source/vst/hosting/eventlist.h +- source/vst/hosting/hostclasses.cpp +- source/vst/hosting/hostclasses.h +- source/vst/hosting/module.cpp +- source/vst/hosting/module.h +- source/vst/hosting/parameterchanges.cpp +- source/vst/hosting/parameterchanges.h +- source/vst/hosting/pluginterfacesupport.cpp +- source/vst/hosting/pluginterfacesupport.h +- source/vst/hosting/processdata.cpp +- source/vst/hosting/processdata.h +- source/vst/utility/optional.h +- source/vst/utility/stringconvert.cpp +- source/vst/utility/stringconvert.h +- source/vst/utility/uid.h +- source/vst/utility/versionparser.h +- source/vst/vstinitiids.cpp +-) +-# add dependencies +-target_link_libraries(sdk_hosting +- PUBLIC +- sdk_common +-) +-target_include_directories(sdk_hosting +- PUBLIC +- ${CMAKE_CURRENT_SOURCE_DIR}/.. +-) +-smtg_setup_universal_binary(sdk_hosting) ++# #--for hosting---------------- ++# add_library(sdk_hosting ++ # STATIC ++ # source/vst/hosting/connectionproxy.cpp ++ # source/vst/hosting/connectionproxy.h ++ # source/vst/hosting/eventlist.cpp ++ # source/vst/hosting/eventlist.h ++ # source/vst/hosting/hostclasses.cpp ++ # source/vst/hosting/hostclasses.h ++ # source/vst/hosting/module.cpp ++ # source/vst/hosting/module.h ++ # source/vst/hosting/parameterchanges.cpp ++ # source/vst/hosting/parameterchanges.h ++ # source/vst/hosting/pluginterfacesupport.cpp ++ # source/vst/hosting/pluginterfacesupport.h ++ # source/vst/hosting/processdata.cpp ++ # source/vst/hosting/processdata.h ++ # source/vst/utility/optional.h ++ # source/vst/utility/stringconvert.cpp ++ # source/vst/utility/stringconvert.h ++ # source/vst/utility/uid.h ++ # source/vst/utility/versionparser.h ++ # source/vst/vstinitiids.cpp ++# ) ++# # add dependencies ++# target_link_libraries(sdk_hosting ++ # PUBLIC ++ # sdk_common ++# ) ++# target_include_directories(sdk_hosting ++ # PUBLIC ++ # ${CMAKE_CURRENT_SOURCE_DIR}/.. ++# ) ++# smtg_setup_universal_binary(sdk_hosting) + +-get_target_property(sdk_hosting_SOURCES sdk_hosting SOURCES) ++# get_target_property(sdk_hosting_SOURCES sdk_hosting SOURCES) + +-# iOS target for hosting +-if(SMTG_MAC AND XCODE AND SMTG_IOS_DEVELOPMENT_TEAM) +- add_library(sdk_hosting_ios STATIC +- ${sdk_hosting_SOURCES} +- ) +- smtg_set_platform_ios(sdk_hosting_ios) +- set_target_properties(sdk_hosting_ios +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +- ) +- target_link_libraries(sdk_hosting_ios +- PUBLIC +- base_ios +- pluginterfaces_ios +- ) +-endif(SMTG_MAC AND XCODE AND SMTG_IOS_DEVELOPMENT_TEAM) ++# # iOS target for hosting ++# if(SMTG_MAC AND XCODE AND SMTG_IOS_DEVELOPMENT_TEAM) ++ # add_library(sdk_hosting_ios STATIC ++ # ${sdk_hosting_SOURCES} ++ # ) ++ # smtg_set_platform_ios(sdk_hosting_ios) ++ # set_target_properties(sdk_hosting_ios ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++ # ) ++ # target_link_libraries(sdk_hosting_ios ++ # PUBLIC ++ # base_ios ++ # pluginterfaces_ios ++ # ) ++# endif(SMTG_MAC AND XCODE AND SMTG_IOS_DEVELOPMENT_TEAM) diff --git a/submodules/0001-VST3_TargetReduction.patch b/submodules/0001-VST3_TargetReduction.patch new file mode 100644 index 000000000..2fb992cc1 --- /dev/null +++ b/submodules/0001-VST3_TargetReduction.patch @@ -0,0 +1,133 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9807407..ea48de8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,7 +89,7 @@ endif(SMTG_AAX_SDK_PATH) + + # Add hosting examples, it includes the validator (must be done before any plug-ins to support running the validator after building) + set(SDK_IDE_HOSTING_EXAMPLES_FOLDER FOLDER "HostingExamples") +-add_subdirectory(public.sdk/samples/vst-hosting) ++#add_subdirectory(public.sdk/samples/vst-hosting) + + #------------------------------------------------------------------------------- + # Here is added your own plug-ins folder location +@@ -119,61 +119,61 @@ if(SMTG_ADD_VST3_PLUGINS_SAMPLES) + add_subdirectory(public.sdk/source/vst/auv3wrapper) + endif(SMTG_ADD_VST3_PLUGINS_SAMPLES) + +-#------------------------------------------------------------------------------- +-# IDE sorting +-#------------------------------------------------------------------------------- +-set_target_properties(sdk +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +-) +-set_target_properties(sdk_common +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +-) +-set_target_properties(sdk_hosting +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +-) +-set_target_properties(base +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +-) +-set_target_properties(pluginterfaces +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +-) +-if(TARGET base_ios) +- set_target_properties(base_ios +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +- ) +- set_target_properties(pluginterfaces_ios +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +- ) +-endif(TARGET base_ios) +- +-if(SMTG_ADD_VSTGUI) +- set_target_properties(vstgui +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +- ) +- set_target_properties(vstgui_support +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +- ) +- set_target_properties(vstgui_uidescription +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +- ) +- +- if(TARGET vstgui_standalone) +- set_target_properties(vstgui_standalone +- PROPERTIES +- ${SDK_IDE_LIBS_FOLDER} +- ) +- endif(TARGET vstgui_standalone) +-endif(SMTG_ADD_VSTGUI) +- +-include(SMTG_CustomModuleTarget) +-set_target_properties(cmake_modules PROPERTIES ${SDK_IDE_LIBS_FOLDER}) ++# #------------------------------------------------------------------------------- ++# # IDE sorting ++# #------------------------------------------------------------------------------- ++# set_target_properties(sdk ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++# ) ++# set_target_properties(sdk_common ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++# ) ++# set_target_properties(sdk_hosting ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++# ) ++# set_target_properties(base ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++# ) ++# set_target_properties(pluginterfaces ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++# ) ++# if(TARGET base_ios) ++ # set_target_properties(base_ios ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++ # ) ++ # set_target_properties(pluginterfaces_ios ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++ # ) ++# endif(TARGET base_ios) ++ ++# if(SMTG_ADD_VSTGUI) ++ # set_target_properties(vstgui ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++ # ) ++ # set_target_properties(vstgui_support ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++ # ) ++ # set_target_properties(vstgui_uidescription ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++ # ) ++ ++ # if(TARGET vstgui_standalone) ++ # set_target_properties(vstgui_standalone ++ # PROPERTIES ++ # ${SDK_IDE_LIBS_FOLDER} ++ # ) ++ # endif(TARGET vstgui_standalone) ++# endif(SMTG_ADD_VSTGUI) ++ ++# include(SMTG_CustomModuleTarget) ++# set_target_properties(cmake_modules PROPERTIES ${SDK_IDE_LIBS_FOLDER}) diff --git a/submodules/CMakeLists.txt b/submodules/CMakeLists.txt index d1376b434..a16930e3d 100644 --- a/submodules/CMakeLists.txt +++ b/submodules/CMakeLists.txt @@ -23,6 +23,9 @@ if (MSVC) # Fix for MSVC 2022 based on https://forums.steinberg.net/t/pluginterf endif() set(SMTG_USE_STATIC_CRT ON CACHE BOOL "" FORCE) set(SMTG_ADD_VSTGUI OFF CACHE BOOL "" FORCE) +set(SMTG_ADD_VST3_PLUGINS_SAMPLES OFF CACHE BOOL "" FORCE) +set(SMTG_ADD_VST3_HOSTING_SAMPLES OFF CACHE BOOL "" FORCE) +set(SMTG_RUN_VST_VALIDATOR OFF CACHE BOOL "" FORCE) if((NOT DEFINED REAPPLY_VST3_PATCHES) OR (${REAPPLY_VST3_PATCHES})) execute_process(COMMAND git apply ../../0001-VST3-base_Add-MinSizeRel-config.patch WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/VST3/base") @@ -30,10 +33,14 @@ if((NOT DEFINED REAPPLY_VST3_PATCHES) OR (${REAPPLY_VST3_PATCHES})) WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/VST3/cmake") execute_process(COMMAND git apply ../../0002-VST3-cmake_Dont-mess-with-project-folders.patch WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/VST3/cmake") + execute_process(COMMAND git apply ../0001-VST3_TargetReduction.patch + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/VST3") + execute_process(COMMAND git apply ../../0001-VST3-publicsdk_TargetReduction.patch + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/VST3/public.sdk") set(REAPPLY_VST3_PATCHES OFF CACHE BOOL "" FORCE) endif() add_subdirectory(VST3) -set_target_properties(base cmake_modules pluginterfaces sdk sdk_common sdk_hosting validator PROPERTIES FOLDER submodules/vst3) +set_target_properties(base pluginterfaces sdk sdk_common PROPERTIES FOLDER submodules/vst3) # libear set(EAR_HIDE_INTERNAL_SYMBOLS OFF CACHE BOOL " " FORCE)