forked from surge-synthesizer/surge
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert interim 1.1 changes for 1.0.1 candidate
Revert this commit to return to the 1.1 pipeline Revert "Linux pluginsonly should be .tar.gz (surge-synthesizer#5832)" This reverts commit edbf08a. Revert "CLAP enable Surge by default (surge-synthesizer#5831)" This reverts commit b75ca09. Revert "Move path to shared sst-plugininfra (surge-synthesizer#5826)" This reverts commit cb81930. Revert "(XT 1.1) Fix various typos (surge-synthesizer#5795)" This reverts commit 78210b5. Revert "Move Surge XT to sst-plugininfra for TinyXML; FS (surge-synthesizer#5799)" This reverts commit a06f419. Revert "Handle StrNat Internal Spaces Differently (surge-synthesizer#5791)" This reverts commit 6b42b59. Revert "Add options for scene highpass slopes up to 48 dB/oct (surge-synthesizer#5762)" This reverts commit 23e5b92. Revert "(XT 1.1) Make certain osc controls semitransparent for Audio In (surge-synthesizer#5766)" This reverts commit 3805547. Revert "(XT 1.1) Move version to 1.1.0 (surge-synthesizer#5800)" This reverts commit 2cb16c8.
- Loading branch information
Showing
110 changed files
with
6,001 additions
and
567 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule clap-juce-extensions
deleted from
66ed91
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
project(filesystem VERSION 0.0.0 LANGUAGES CXX) | ||
|
||
set(INC_DIR "${CMAKE_CURRENT_BINARY_DIR}/include") | ||
set(HEADER_DIR "${INC_DIR}/${PROJECT_NAME}") | ||
|
||
function(generate_header FS_HEADER FS_NAMESPACE) | ||
message(STATUS "${PROJECT_NAME}: Using ${FS_NAMESPACE} from ${FS_HEADER}") | ||
set(HEADER_FILE "${HEADER_DIR}/import.h") | ||
configure_file(src/import.h.in "${HEADER_FILE}" @ONLY) | ||
target_sources(${PROJECT_NAME} INTERFACE "${HEADER_FILE}") | ||
endfunction() | ||
|
||
function(use_ghc_fs) | ||
# Don't export GHC symbols from ELF shared objects | ||
set(HEADER_FILE "${HEADER_DIR}/ghc-filesystem.h") | ||
file(STRINGS ghc-filesystem/include/ghc/filesystem.hpp HEADER_DATA NEWLINE_CONSUME NO_HEX_CONVERSION) | ||
string(REPLACE "__attribute__((visibility(\"default\")))" "" HEADER_DATA "${HEADER_DATA}") | ||
file(WRITE "${HEADER_FILE}" ${HEADER_DATA}) | ||
|
||
add_library(${PROJECT_NAME} src/ghc-filesystem.cpp "${HEADER_FILE}") | ||
generate_header("\"filesystem/ghc-filesystem.h\"" "ghc::filesystem") | ||
target_compile_definitions(${PROJECT_NAME} | ||
INTERFACE GHC_FILESYSTEM_FWD | ||
PUBLIC GHC_RAISE_UNICODE_ERRORS GHC_WIN_WSTRING_STRING_TYPE | ||
PRIVATE GHC_FILESYSTEM_IMPLEMENTATION | ||
) | ||
target_include_directories(${PROJECT_NAME} PUBLIC "${INC_DIR}") | ||
endfunction() | ||
|
||
function(use_platform_fs) | ||
add_library(${PROJECT_NAME} INTERFACE) | ||
generate_header("<filesystem>" "std::filesystem") | ||
target_include_directories(${PROJECT_NAME} INTERFACE "${INC_DIR}") | ||
endfunction() | ||
|
||
if (UNIX AND NOT APPLE) | ||
# with gcc11 on arch and latest ardour we get a crash in std::fs if we use the | ||
# os provided one so keep this as an option but default to off | ||
set(SURGE_FILESYSTEM_FORCE_GHC ON CACHE BOOL "Force GHC filesystem implementation") | ||
else() | ||
set(SURGE_FILESYSTEM_FORCE_GHC OFF CACHE BOOL "Force GHC filesystem implementation") | ||
endif() | ||
if (${SURGE_FILESYSTEM_FORCE_GHC}) | ||
use_ghc_fs() | ||
else() | ||
include(CheckCXXSourceCompiles) | ||
check_cxx_source_compiles(" | ||
#include <filesystem> | ||
namespace fs = std::filesystem; | ||
int main(int, char **argv) { | ||
return fs::recursive_directory_iterator{fs::path{*argv}}.depth(); | ||
}" SURGE_FILESYSTEM_STD_FS_FOUND) | ||
if (SURGE_FILESYSTEM_STD_FS_FOUND) | ||
use_platform_fs() | ||
else() | ||
use_ghc_fs() | ||
endif() | ||
endif() | ||
|
||
add_library(surge::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) |
Submodule ghc-filesystem
added at
8166dd
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
/* | ||
** Surge Synthesizer is Free and Open Source Software | ||
** | ||
** Surge is made available under the Gnu General Public License, v3.0 | ||
** https://www.gnu.org/licenses/gpl-3.0.en.html | ||
** | ||
** Copyright 2004-2021 by various individuals as described by the Git transaction log | ||
** | ||
** All source at: https://github.com/surge-synthesizer/surge.git | ||
** | ||
** Surge was a commercial product from 2004-2018, with Copyright and ownership | ||
** in that period held by Claes Johanson at Vember Audio. Claes made Surge | ||
** open source in September 2018. | ||
*/ | ||
|
||
#include "filesystem/import.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
#pragma once | ||
|
||
/* | ||
** This file imports filesystem and sets the fs namespace to the correct | ||
** thing. In a distant future where we are compiling with all our compilers | ||
** and sdks set up to have std::filesystem this will go away. But while still | ||
** supporting VS2017 and macos 10.12 and stuff we need it. | ||
*/ | ||
|
||
#include @FS_HEADER@ | ||
namespace fs = @FS_NAMESPACE@; | ||
|
||
#include <utility> | ||
|
||
inline std::string path_to_string(const fs::path& path) | ||
{ | ||
#ifdef _WIN32 | ||
return path.u8string(); | ||
#else | ||
return path.generic_string(); | ||
#endif | ||
} | ||
|
||
template<typename T> | ||
inline fs::path string_to_path(T&& path) | ||
{ | ||
#ifdef _WIN32 | ||
return fs::u8path(std::forward<T>(path)); | ||
#else | ||
return fs::path(std::forward<T>(path)); | ||
#endif | ||
} | ||
|
||
void string_to_path(fs::path) = delete; |
Submodule sst-cpputils
deleted from
916c8c
Submodule sst-plugininfra
deleted from
c69767
Oops, something went wrong.