0.6.0

Author: atkAudioUser

.gitignore

@@ -14,8 +14,8 @@
 !buildspec.json
 !CMakeLists.txt
 !CMakePresets.json
-!LICENSE*
 !README.md
+!LICENSE*
 
 !/lib
 !.vscode

CMakeLists.txt

@@ -1,21 +1,21 @@
 cmake_minimum_required(VERSION 3.28...3.30)
 
+set(CMAKE_COMPILE_WARNING_AS_ERROR OFF)
+
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake")
 string(JSON _displayName GET ${buildspec} displayName)
+string(JSON _windowsApp GET ${buildspec} uuids windowsApp)
 
 project(${_name} VERSION ${_version})
 
-if(WIN32)
-    set(CMAKE_INSTALL_PREFIX "$ENV{ProgramData}/obs-studio/plugins/${CMAKE_PROJECT_NAME}" CACHE STRING "Default plugin installation directory" FORCE)
-endif()
-
 option(ENABLE_FRONTEND_API "Use obs-frontend-api for UI functionality" OFF)
 option(ENABLE_QT "Use Qt functionality" OFF)
 
 include(compilerconfig)
 include(defaults)
 include(helpers)
 
+
 add_library(${CMAKE_PROJECT_NAME} MODULE)
 
 find_package(libobs REQUIRED)
@@ -48,4 +48,9 @@ configure_file(src/config.h.in config.h @ONLY)
 
 set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CXX_STANDARD 23)
 
-add_subdirectory(lib/atkaudio)
+add_subdirectory(lib/atkaudio)
+
+# Sanitize CMAKE_INSTALL_PREFIX path (convert to CMake style and remove trailing slash)
+file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" _sanitized_prefix)
+string(REGEX REPLACE "/$" "" _sanitized_prefix "${_sanitized_prefix}")
+set(CMAKE_INSTALL_PREFIX "${_sanitized_prefix}" CACHE PATH "Sanitized install prefix" FORCE)

CMakePresets.json

@@ -1,8 +1,8 @@
 {
-  "version": 3,
+  "version": 8,
   "cmakeMinimumRequired": {
     "major": 3,
-    "minor": 22,
+    "minor": 28,
     "patch": 0
   },
   "configurePresets": [
@@ -34,6 +34,7 @@
       },
       "cacheVariables": {
         "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",
+        "CMAKE_OSX_ARCHITECTURES": "arm64;x86_64",
         "CODESIGN_IDENTITY": "$penv{CODESIGN_IDENT}",
         "CODESIGN_TEAM": "$penv{CODESIGN_TEAM}"
       }
@@ -47,7 +48,8 @@
       "description": "Build for macOS 11.0+ (Universal binary) for CI",
       "generator": "Xcode",
       "cacheVariables": {
-        "CMAKE_COMPILE_WARNING_AS_ERROR": false
+        "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+        "ENABLE_CCACHE": true
       }
     },
     {
@@ -64,13 +66,10 @@
         "rhs": "Windows"
       },
       "generator": "Visual Studio 17 2022",
-      "architecture": "x64",
+      "architecture": "x64,version=10.0.22621",
       "warnings": {
         "dev": true,
         "deprecated": true
-      },
-      "cacheVariables": {
-        "CMAKE_SYSTEM_VERSION": "10.0.18363.657"
       }
     },
     {
@@ -85,9 +84,9 @@
       }
     },
     {
-      "name": "linux-x86_64",
-      "displayName": "Linux x86_64",
-      "description": "Build for Linux x86_64",
+      "name": "ubuntu-x86_64",
+      "displayName": "Ubuntu x86_64",
+      "description": "Build for Ubuntu x86_64",
       "inherits": [
         "template"
       ],
@@ -102,54 +101,22 @@
         "dev": true,
         "deprecated": true
       },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      }
-    },
-    {
-      "name": "linux-ci-x86_64",
-      "inherits": [
-        "linux-x86_64"
-      ],
-      "displayName": "Linux x86_64 CI build",
-      "description": "Build for Linux x86_64 on CI",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_COMPILE_WARNING_AS_ERROR": false
+        "CMAKE_INSTALL_LIBDIR": "lib/CMAKE_SYSTEM_PROCESSOR-linux-gnu"
       }
     },
     {
-      "name": "linux-aarch64",
-      "displayName": "Linux aarch64",
-      "description": "Build for Linux aarch64",
+      "name": "ubuntu-ci-x86_64",
       "inherits": [
-        "template"
+        "ubuntu-x86_64"
       ],
-      "binaryDir": "${sourceDir}/build_aarch64",
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      },
-      "generator": "Ninja",
-      "warnings": {
-        "dev": true,
-        "deprecated": true
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      }
-    },
-    {
-      "name": "linux-ci-aarch64",
-      "inherits": [
-        "linux-aarch64"
-      ],
-      "displayName": "Linux aarch64 CI build",
-      "description": "Build for Linux aarch64 on CI",
+      "displayName": "Ubuntu x86_64 CI build",
+      "description": "Build for Ubuntu x86_64 on CI",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_COMPILE_WARNING_AS_ERROR": false
+        "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+        "ENABLE_CCACHE": true
       }
     }
   ],
@@ -183,31 +150,17 @@
       "configuration": "Release"
     },
     {
-      "name": "linux-x86_64",
-      "configurePreset": "linux-x86_64",
-      "displayName": "Linux x86_64",
-      "description": "Linux build for x86_64",
-      "configuration": "Debug"
-    },
-    {
-      "name": "linux-ci-x86_64",
-      "configurePreset": "linux-ci-x86_64",
-      "displayName": "Linux x86_64 CI",
-      "description": "Linux CI build for x86_64",
+      "name": "ubuntu-x86_64",
+      "configurePreset": "ubuntu-x86_64",
+      "displayName": "Ubuntu x86_64",
+      "description": "Ubuntu build for x86_64",
       "configuration": "Release"
     },
     {
-      "name": "linux-aarch64",
-      "configurePreset": "linux-aarch64",
-      "displayName": "Linux aarch64",
-      "description": "Linux build for aarch64",
-      "configuration": "Debug"
-    },
-    {
-      "name": "linux-ci-aarch64",
-      "configurePreset": "linux-ci-aarch64",
-      "displayName": "Linux aarch64 CI",
-      "description": "Linux CI build for aarch64",
+      "name": "ubuntu-ci-x86_64",
+      "configurePreset": "ubuntu-ci-x86_64",
+      "displayName": "Ubuntu x86_64 CI",
+      "description": "Ubuntu CI build for x86_64",
       "configuration": "Release"
     }
   ]