Skip to content

Commit

Permalink
Allow some non-rack build configurations to proceed
Browse files Browse the repository at this point in the history
- don't fail 32 bit early
- only use fnochar whatzit if c++ is 20, which it isn't in version 2.2.* / srg 1.3.*

Closes #975
Closes #976
  • Loading branch information
baconpaul committed Jan 11, 2024
1 parent afb5a56 commit 28eeaca
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ message(STATUS "SURGE_RACK_SURGE_VERSION ${SURGE_RACK_SURGE_VERSION}")

add_subdirectory(libs/sst-rackhelpers)

set(SURGE_BUILD_32BIT_LINUX TRUE CACHE BOOL "Allow 32 bit to try")
set(SURGE_SKIP_JUCE_FOR_RACK TRUE CACHE BOOL "skip surge Juce build")
set(SURGE_SKIP_LUA TRUE CACHE BOOL "skip surge Lua build")
set(SURGE_SKIP_AIRWINDOWS TRUE CACHE BOOL "skip surge airwindows build")
Expand Down Expand Up @@ -68,7 +69,11 @@ 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> $<$<COMPILE_LANGUAGE:CXX>:-fno-char8_t>)
add_compile_options($<$<BOOL:${SURGE_XT_WARNINGS_ARE_ERRORS}>:-Werror>)
if (CMAKE_CXX_STANDARD GREATER_EQUAL 20)
message(STATUS "Turning on fno-char8_t for c++20")
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fno-char8_t>)
endif()
add_compile_definitions($<$<CONFIG:Debug>:SURGEXT_RACK_DEBUG>)

add_library(Surge INTERFACE)
Expand Down
2 changes: 1 addition & 1 deletion surge
Submodule surge updated 60 files
+7 −1 CMakeLists.txt
+6 −3 azure-pipelines.yml
+ resources/data/patches_3rdparty/John Valentine/FX/Distant Thunder Rumble.fxp
+ resources/data/patches_3rdparty/John Valentine/FX/Grandfather Clock Ticking.fxp
+ resources/data/patches_3rdparty/John Valentine/FX/Mission Control Space Radio.fxp
+ resources/data/patches_3rdparty/John Valentine/FX/Pebble Beach Breaking Ocean Waves And Cave.fxp
+ resources/data/patches_3rdparty/John Valentine/Percussion/Rainmaker.fxp
+ resources/data/patches_3rdparty/John Valentine/Percussion/Tongue Drum.fxp
+ resources/data/patches_3rdparty/John Valentine/Winds/Cor Anglais.fxp
+ resources/data/patches_3rdparty/John Valentine/Winds/Oboe.fxp
+2 −3 resources/surge-shared/oscspecification.html
+1 −0 scripts/code_utils/fix_file_comments.pl
+ scripts/installer_win/assets/banner1.bmp
+ scripts/installer_win/assets/banner2.bmp
+ scripts/installer_win/assets/banner3.bmp
+ scripts/installer_win/assets/banner4.bmp
+ scripts/installer_win/assets/empty.bmp
+ scripts/installer_win/assets/source/banner.sketch
+ scripts/installer_win/assets/surge.ico
+ scripts/installer_win/assets/surge_blue.ico
+6 −2 scripts/installer_win/surge32.iss
+8 −4 scripts/installer_win/surge64.iss
+100 −0 scripts/osc-tests/OSC_test.py
+73 −0 scripts/osc-tests/OSC_test_hang2.py
+78 −0 scripts/osc-tests/OSC_test_hang3.py
+53 −14 src/common/Parameter.cpp
+2 −1 src/common/Parameter.h
+14 −9 src/common/SurgePatch.cpp
+2 −0 src/common/SurgeStorage.cpp
+3 −0 src/common/SurgeStorage.h
+40 −0 src/common/SurgeSynthesizer.cpp
+4 −0 src/common/UserDefaults.cpp
+1 −0 src/common/UserDefaults.h
+1 −1 src/common/dsp/effects/AudioInputEffect.cpp
+32 −12 src/common/dsp/effects/BBDEnsembleEffect.cpp
+1 −1 src/common/dsp/effects/chowdsp/tape/HysteresisProcessing.h
+3 −0 src/common/dsp/oscillators/StringOscillator.cpp
+9 −3 src/common/dsp/oscillators/TwistOscillator.cpp
+2 −0 src/common/globals.h
+8 −8 src/surge-fx/SurgeFXEditor.cpp
+6 −6 src/surge-fx/SurgeLookAndFeel.h
+43 −0 src/surge-testrunner/UnitTestsMIDI.cpp
+15 −13 src/surge-xt/CMakeLists.txt
+3 −3 src/surge-xt/SurgeSynthEditor.cpp
+17 −8 src/surge-xt/SurgeSynthProcessor.cpp
+7 −8 src/surge-xt/SurgeSynthProcessor.h
+5 −1 src/surge-xt/cli/cli-main.cpp
+19 −20 src/surge-xt/gui/AccessibleHelpers.h
+31 −2,044 src/surge-xt/gui/SurgeGUIEditor.cpp
+2,109 −0 src/surge-xt/gui/SurgeGUIEditorMenuStructures.cpp
+4 −1 src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp
+7 −6 src/surge-xt/gui/overlays/ModulationEditor.cpp
+6 −6 src/surge-xt/gui/widgets/ModulatableSlider.cpp
+7 −7 src/surge-xt/gui/widgets/MultiSwitch.cpp
+43 −22 src/surge-xt/gui/widgets/PatchSelector.cpp
+1 −1 src/surge-xt/gui/widgets/PatchSelector.h
+9 −9 src/surge-xt/gui/widgets/Switch.cpp
+8 −8 src/surge-xt/gui/widgets/XMLConfiguredMenus.cpp
+55 −47 src/surge-xt/osc/OpenSoundControl.cpp
+4 −3 src/surge-xt/osc/OpenSoundControl.h

0 comments on commit 28eeaca

Please sign in to comment.