Build - fix Windows build

Also clean final references to USE_SYSTEM_LIBS

Author: samaaron

app/CMakeLists.txt

@@ -1,21 +1,22 @@
 cmake_minimum_required(VERSION 3.13)
 set(APP_ROOT ${CMAKE_CURRENT_LIST_DIR})
 
+# Different triplet for windows
+if (WIN32)
+    set(VCPKG_TARGET_TRIPLET x64-windows-static-md CACHE STRING "triplet")
+endif()
+
 # vcpkg toolchain - Must be declared before project
 
-if ((WIN32 OR APPLE) AND (NOT USE_SYSTEM_LIBS))
+if (WIN32 OR APPLE)
   set(CMAKE_TOOLCHAIN_FILE ${APP_ROOT}/vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
 endif()
 
 project(SonicPi)
 
-
 message(STATUS "CMakeLists: Sonic Pi")
 
-# Different triplet for windows
-if (WIN32)
-    set(VCPKG_TARGET_TRIPLET x64-windows-static-md CACHE STRING "triplet")
-endif()
+
 
 # Sonic Pi Requires a C++ 17 Compiler to build it
 set(CMAKE_CXX_STANDARD 17)

app/external/CMakeLists.txt

@@ -4,17 +4,14 @@ set(APP_ROOT ${CMAKE_CURRENT_LIST_DIR})
 
 # vcpkg toolchain - Must be declared before project
 
-if ((WIN32 OR APPLE) AND (NOT USE_SYSTEM_LIBS))
+if (WIN32 OR APPLE)
   set(CMAKE_TOOLCHAIN_FILE ${APP_ROOT}/../vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
 endif()
 
 message(STATUS "Externals Builder")
 
 project(ExternalsBuilder)
 
-option(USE_SYSTEM_LIBS "Use system libraries instead of bundled libraries when building" OFF)
-
-message(STATUS "USE_SYSTEM_LIBS: ${USE_SYSTEM_LIBS}")
 
 # Set default build type for sp_midi and sp_link
 if (NOT CMAKE_BUILD_TYPE)
@@ -36,7 +33,7 @@ ExternalProject_Add(sp_midi
     CMAKE_ARGS
         -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
         -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
-        -DUSE_SYSTEM_RTMIDI=${USE_SYSTEM_LIBS}
+
     BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
     )
 
@@ -50,7 +47,7 @@ ExternalProject_Add(sp_link
     BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
     )
 
-if(NOT USE_SYSTEM_LIBS)
+if (WIN32 OR APPLE)
     find_package(SndFile CONFIG REQUIRED)
 
     ExternalProject_Add(aubio-project
@@ -71,21 +68,22 @@ endif()
 add_executable(aubio_onset
     ${CMAKE_CURRENT_LIST_DIR}/aubio/aubioonset.c
     ${CMAKE_CURRENT_LIST_DIR}/aubio/utils.c)
-if(USE_SYSTEM_LIBS)
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(aubio REQUIRED IMPORTED_TARGET aubio)
-    target_link_libraries(aubio_onset
-        PRIVATE
-        PkgConfig::aubio)
-else()
+if (WIN32 OR APPLE)
     add_dependencies(aubio_onset aubio-project)
     target_include_directories(aubio_onset PRIVATE ${CMAKE_BINARY_DIR}/aubio-package/include)
     target_link_directories(aubio_onset PRIVATE ${CMAKE_BINARY_DIR}/aubio-package/lib)
     target_link_libraries(aubio_onset
         PRIVATE
         aubio
         SndFile::sndfile)
+else()
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(aubio REQUIRED IMPORTED_TARGET aubio)
+    target_link_libraries(aubio_onset
+        PRIVATE
+        PkgConfig::aubio)
 endif()
+
 if(UNIX)
     target_link_libraries(aubio_onset
         PRIVATE

app/gui/CMakeLists.txt

@@ -60,13 +60,12 @@ endif()
 
 find_package(Threads REQUIRED)
 
-if(USE_SYSTEM_LIBS)
+if(NOT (APPLE OR WIN32))
   # Try to find the system-installed QScintilla without immediately failing
   find_package(QScintilla QUIET)
 endif()
 
-# If QScintilla wasn’t found (either because USE_SYSTEM_LIBS wasn’t set or the system install is missing),
-# use the vendored version.
+# If QScintilla wasn’t found use the vendored version.
 if(NOT QScintilla_FOUND)
   message(STATUS "System QScintilla not found. Falling back to bundled QScintilla.")
   add_subdirectory(QScintilla_src-2.14.1)
@@ -202,9 +201,8 @@ SET(TS_FILES
     ${QTAPP_ROOT}/lang/sonic-pi_zh.ts
 )
 
-# Enable tracy profiler on debug and rel with debug builds
 if(WIN32)
-    SET (SOURCES ${SOURCES} ${APP_ROOT}/external/tracy/TracyClient.cpp)
+  # do nothing
 elseif(APPLE)
   SET (SOURCES ${SOURCES} ${QTAPP_ROOT}/platform/macos.mm)
   SET (SOURCES ${SOURCES} ${QTAPP_ROOT}/platform/macos.h)
@@ -359,8 +357,6 @@ endif()
 if(WIN32)
     # Workaround Qt + MSVC 19 compile issue in release build.
     target_compile_options(${APP_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/wd4005 /W3 /D_CRT_SECURE_NO_WARNINGS /D_WINSOCK_DEPRECATED_NO_WARNINGS /DBOOST_DATE_TIME_NO_LIB>)
-    target_compile_options(${APP_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-DTRACY_ENABLE=1>")
-    target_compile_options(${APP_NAME} PRIVATE "$<$<CONFIG:RELWITHDEBINFO>:-DTRACY_ENABLE=1>")
 elseif(${CMAKE_SYSTEM_NAME} MATCHES Linux)
     # Link librt
     target_link_libraries(${APP_NAME} PRIVATE rt)
@@ -373,6 +369,12 @@ if(WIN32)
     include(InstallRequiredSystemLibraries)
     file(COPY ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/Release)
 
+    # Copy kissfft.dll from the API build directory to the GUI executable directory
+    add_custom_command(TARGET ${APP_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${CMAKE_SOURCE_DIR}/build/api/vendor/kissfft-131.1.0/Release/kissfft-float.dll"
+            $<TARGET_FILE_DIR:${APP_NAME}>)
+
     # Run winddeployqt if it can be found, to ensure installed dependencies
     add_custom_command(TARGET ${APP_NAME} POST_BUILD
         COMMAND ${CMAKE_PREFIX_PATH}/bin/windeployqt $<TARGET_FILE:${APP_NAME}>)

app/linux-config.sh

@@ -11,7 +11,6 @@ trap cleanup_function EXIT
 
 args=("$@")
 config="Release"
-system_libs=false
 
 # extract options and their arguments into variables.
 while [ -n "$1" ]; do
@@ -40,5 +39,5 @@ mkdir -p "${SCRIPT_DIR}/build"
 echo "Generating makefiles..."
 cd "${SCRIPT_DIR}/build"
 
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="$config" -DUSE_SYSTEM_LIBS=ON ..
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="$config"
 

app/server/beam/tau/CMakeLists.txt

@@ -12,10 +12,6 @@ message(STATUS "External NIF Builder")
 
 project(ExternalsBuilder)
 
-option(USE_SYSTEM_LIBS "Use system libraries instead of bundled libraries when building" OFF)
-
-message(STATUS "USE_SYSTEM_LIBS: ${USE_SYSTEM_LIBS}")
-
 include(GNUInstallDirs)
 include(ExternalProject)
 

app/win-config.bat

@@ -16,7 +16,7 @@ cd build
 @REM explicitly, but as we also pass it in here it will be used by the cmake
 @REM build files for app/external
 
-cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=%CONFIG% ..\
+cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=%CONFIG% -DKISSFFT_TOOLS=OFF -DKISSFFT_PKGCONFIG=OFF ..\
 if %ERRORLEVEL% neq 0 (
     cd %WORKING_DIR%
     exit /b %ERRORLEVEL%

app/win-pre-vcpkg.bat

@@ -5,7 +5,7 @@ cd %~dp0
 REM Build vcpkg
 if not exist "vcpkg\" (
     echo Cloning vcpkg
-    git clone --depth 1 --branch 2024.12.16 https://github.com/microsoft/vcpkg.git vcpkg
+    git clone --depth 1 --branch 2025.02.14 https://github.com/microsoft/vcpkg.git vcpkg
 )
 
 set VCPKG_ROOT=%~dp0/vcpkg