diff --git a/.vscode/launch.json b/.vscode/launch.json index 8b66d735..7a84b91f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,7 +5,19 @@ "version": "0.2.0", "configurations": [ { - "name": "Debug SP", + "name": "MacOS (lldb) Debug", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/../build_ScreenPlay_Qt_6_3_2_Clang/bin/ScreenPlay.app/Contents/MacOS/ScreenPlay", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false, + "MIMode": "lldb" + }, + { + "name": "Windows Debug ScreenPlay", "type": "cppvsdbg", "request": "launch", "program": "${workspaceFolder}/../build_ScreenPlay_Qt_6_4_1_MSVC2019/bin/ScreenPlay.exe", diff --git a/CMakePresets.json b/CMakePresets.json index 43bdc884..ce0424fa 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -79,7 +79,7 @@ "displayName": "ScreenPlay 64bit Debug osx", "description": "Osx only!", "generator": "Ninja", - "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6_3_2_GCC", + "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6_3_2_Clang", "condition": { "type": "equals", "lhs": "${hostSystemName}", diff --git a/ScreenPlayUtil/CMakeLists.txt b/ScreenPlayUtil/CMakeLists.txt index f3abbb47..dc52d9d8 100644 --- a/ScreenPlayUtil/CMakeLists.txt +++ b/ScreenPlayUtil/CMakeLists.txt @@ -40,7 +40,7 @@ set(QML qml/TrayIcon.qml) set(SOURCES # cmake-format: sort - inc/public/ScreenPlayUtil/httpfileserver.cpp src/contenttypes.cpp src/util.cpp src/macutils.mm) + inc/public/ScreenPlayUtil/httpfileserver.cpp src/contenttypes.cpp src/util.cpp) set(HEADER # cmake-format: sort @@ -54,9 +54,13 @@ set(HEADER inc/public/ScreenPlayUtil/PropertyHelpers.h inc/public/ScreenPlayUtil/PtrPropertyHelpers.h inc/public/ScreenPlayUtil/SingletonHelper.h - inc/public/ScreenPlayUtil/macutils.h inc/public/ScreenPlayUtil/util.h) +if(APPLE) + list(APPEND SOURCES src/macutils.mm) + list(APPEND HEADER inc/public/ScreenPlayUtil/macutils.h) +endif() + set(RESOURCES # cmake-format: sort assets/icons/attach_file.svg assets/icons/description.svg assets/icons/folder.svg)