Skip to content

Commit

Permalink
take 2
Browse files Browse the repository at this point in the history
  • Loading branch information
baconpaul committed Aug 5, 2023
1 parent 81baef2 commit 57bc8df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ set(SURGE_SKIP_STANDALONE TRUE CACHE BOOL "skip surge standalone build")
set(SURGE_COMPILE_BLOCK_SIZE 8 CACHE STRING "surge compile block size")
set(SURGE_SIMDE_PATH "${RACK_SDK_DIR}/dep/include" CACHE STRING "surge simde is rack simde")


add_subdirectory(surge)
# turn off specific warning as errors enforced by Rack-SDK compiler options for surge libs
# the warnings should be fixed in the dependencies or the warning could be disabled in the
Expand Down Expand Up @@ -63,7 +64,7 @@ target_compile_options(surge-common PRIVATE -Wno-sign-compare -Wno-ignored-quali

target_compile_options(surge-common PRIVATE $<$<STREQUAL:${CMAKE_OSX_ARCHITECTURES},arm64>:-faligned-allocation>)

add_compile_options($<$<BOOL:${SURGE_XT_WARNINGS_ARE_ERRORS}>:-Werror>)
add_compile_options($<$<BOOL:${SURGE_XT_WARNINGS_ARE_ERRORS}>:-Werror> $<$<COMPILE_LANGUAGE:CXX>:-fno-char8_t>)
add_compile_definitions($<$<CONFIG:Debug>:SURGEXT_RACK_DEBUG>)

add_library(Surge INTERFACE)
Expand Down Expand Up @@ -101,6 +102,7 @@ target_sources(${RACK_PLUGIN_LIB} PRIVATE
src/XTWidgets.cpp)

target_link_libraries(${RACK_PLUGIN_LIB} PRIVATE Surge sst-rackhelpers)
target_compile_options(${RACK_PLUGIN_LIB} PUBLIC -fno-char8_t)

file(COPY surge/resources/surge-shared/configuration.xml
surge/resources/surge-shared/windows.wt
Expand Down
2 changes: 1 addition & 1 deletion src/XTWidgets.h
Original file line number Diff line number Diff line change
Expand Up @@ -2156,7 +2156,7 @@ struct ThereAreFourLights : rack::app::SliderKnob, style::StyleParticipant

menu->addChild(new rack::MenuSeparator);
menu->addChild(
rack::createMenuItem("Initialize", "Double-click", [=]() { this->resetAction(); }));
rack::createMenuItem("Initialize", "Double-click", [this]() { this->resetAction(); }));
}
};

Expand Down

0 comments on commit 57bc8df

Please sign in to comment.