gearmulator

commit 20b1a6e302b3c258972cf1d3a48a85c557add6d5
parent 9442722906683f6e800dfbaa8016c216c7717f57
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Thu, 18 Jul 2024 19:02:22 +0200

Merge branch 'oss/main' into priv/n2x

Diffstat:
M
build_linux.sh
 | 
4
++--
M
source/mqLib/mqdsp.cpp
 | 
2
+-
M
temp/cmake_win64/gearmulator.sln.DotSettings
 | 
1
+

3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/build_linux.sh b/build_linux.sh
@@ -7,8 +7,8 @@ else
 	threads=$1
 fi
 
-cmake . -B ./temp/cmake_${host} -Dgearmulator_BUILD_JUCEPLUGIN=ON -Dgearmulator_BUILD_JUCEPLUGIN_CLAP=ON -Dgearmulator_BUILD_JUCEPLUGIN_LV2=ON -Dgearmulator_SYNTH_OSIRUS=ON
-cd ./temp/cmake_${host}
+cmake . -B ./temp/cmake_linux_${host} -Dgearmulator_BUILD_JUCEPLUGIN=ON -Dgearmulator_BUILD_JUCEPLUGIN_CLAP=ON -Dgearmulator_BUILD_JUCEPLUGIN_LV2=ON -Dgearmulator_SYNTH_OSIRUS=ON
+cd ./temp/cmake_linux_${host}
 cmake --build . --config Release -j $threads
 cpack -G DEB
 cpack -G RPM
diff --git a/source/mqLib/mqdsp.cpp b/source/mqLib/mqdsp.cpp
@@ -98,7 +98,7 @@ namespace mqLib
 		});
 
 #if DSP56300_DEBUGGER
-		m_thread.reset(new dsp56k::DSPThread(dsp(), m_name.c_str(), std::make_shared<dsp56kDebugger::Debugger>(m_dsp.dsp())));
+		m_thread.reset(new dsp56k::DSPThread(dsp(), m_name.c_str(), std::make_shared<dsp56kDebugger::Debugger>(m_dsp)));
 #else
 		m_thread.reset(new dsp56k::DSPThread(dsp(), m_name.c_str()));
 #endif
diff --git a/temp/cmake_win64/gearmulator.sln.DotSettings b/temp/cmake_win64/gearmulator.sln.DotSettings
@@ -18,6 +18,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/Abbreviations/=PC/@EntryIndexedValue">PC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/Abbreviations/=ROM/@EntryIndexedValue">ROM</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/Abbreviations/=RX/@EntryIndexedValue">RX</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/Abbreviations/=SC/@EntryIndexedValue">SC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/Abbreviations/=SP/@EntryIndexedValue">SP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/Abbreviations/=SR/@EntryIndexedValue">SR</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CppNaming/Abbreviations/=SSH/@EntryIndexedValue">SSH</s:String>