Build SFML dynamically for the windows release packages

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
         - { name: Windows Clang,       os: windows-2022, flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
         - { name: Linux GCC,           os: ubuntu-22.04, flags: -GNinja }
         - { name: Linux Clang,         os: ubuntu-22.04, flags: -GNinja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
-        - { name: MacOS,               os: macos-13,     flags: -GNinja }
+        - { name: MacOS,               os: macos-12,     flags: -GNinja }
         type:
         - { name: Debug }
         - { name: Release }
@@ -42,7 +42,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: SFML/SFML
-        ref: 2.6.2
+        ref: 2.6.1
         path: SFML
 
     - name: Configure SFML CMake

.github/workflows/nuget.yml

@@ -1,10 +1,7 @@
 name: NuGet Release
 
 on:
-    push:
-        branches:
-            - master
-            - 2.6.x
+    push: {}
     workflow_dispatch: {}
 
 concurrency:

.github/workflows/release.yml

@@ -1,12 +1,7 @@
 name: Release Builds
 
 on:
-    push:
-        branches:
-            - master
-            - 2.6.x
-        tags:
-            - "**"
+    push: {}
     workflow_dispatch: {}
 
 concurrency:
@@ -51,12 +46,12 @@ jobs:
 
             - name: Build SFML
               run: |
-                  cmake -S SFML -B SFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_STATIC_STD_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake -S SFML -B SFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
                   cmake --build SFML-build --config Release --target install
 
             - name: Build CSFML
               run: |
-                  cmake -S CSFML -B CSFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake -S CSFML -B CSFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=FALSE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
                   cmake --build CSFML-build --config Release --target install
             
             - name: Add MinGW to PATH
@@ -93,6 +88,7 @@ jobs:
                   Pop-Location
 
                   New-Item -ItemType "directory" -PATH "install"
+                  Move-Item -Path "SFML-install\bin\*" -Destination "install\CSFML"
                   Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
 
             - name: Upload Artifact
@@ -138,12 +134,12 @@ jobs:
 
             - name: Build SFML
               run: |
-                  cmake -S SFML -B SFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_STATIC_STD_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake -S SFML -B SFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
                   cmake --build SFML-build --config Release --target install
 
             - name: Build CSFML
               run: |
-                  cmake -S CSFML -B CSFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DSTATIC_STD_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=TRUE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
+                  cmake -S CSFML -B CSFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=TRUE -DCSFML_LINK_SFML_STATICALLY=FALSE -DCMAKE_BUILD_TYPE=Release -DSFML_DIR=${{ github.workspace }}/SFML-install/lib/cmake/SFML -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
                   cmake --build CSFML-build --config Release --target install
 
             - name: Add MinGW to PATH
@@ -180,6 +176,7 @@ jobs:
                   Pop-Location
 
                   New-Item -ItemType "directory" -PATH "install"
+                  Move-Item -Path "SFML-install\bin\*" -Destination "install\CSFML"
                   Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
 
             - name: Upload Artifact

doc/CMakeLists.txt

@@ -48,7 +48,7 @@ add_custom_target(doc ALL
 install(DIRECTORY ${DOXYGEN_OUTPUT_DIR}/html
         DESTINATION ${INSTALL_MISC_DIR}/doc
         COMPONENT doc)
-if(DOXYGEN_GENERATE_HTMLHELP)
+if(DOXYGEN_HHC_PROGRAM)
     install(FILES ${DOXYGEN_OUTPUT_DIR}/CSFML.chm
             DESTINATION ${INSTALL_MISC_DIR}/doc
             COMPONENT doc)

include/SFML/Audio/SoundBufferRecorder.h

@@ -129,37 +129,5 @@ CSFML_AUDIO_API sfBool sfSoundBufferRecorder_setDevice(sfSoundBufferRecorder* so
 ////////////////////////////////////////////////////////////
 CSFML_AUDIO_API const char* sfSoundBufferRecorder_getDevice(sfSoundBufferRecorder* soundBufferRecorder);
 
-////////////////////////////////////////////////////////////
-/// \brief Set the channel count of the audio capture device
-///
-/// This method allows you to specify the number of channels
-/// used for recording. Currently only 16-bit mono and
-/// 16-bit stereo are supported.
-///
-/// \param soundBufferRecorder Sound buffer recorder object
-/// \param channelCount Number of channels. Currently only
-///                     mono (1) and stereo (2) are supported.
-///
-/// \see sfSoundBufferRecorder_getChannelCount
-///
-////////////////////////////////////////////////////////////
-CSFML_AUDIO_API void sfSoundBufferRecorder_setChannelCount(sfSoundBufferRecorder* soundBufferRecorder,
-                                                           unsigned int           channelCount);
-
-////////////////////////////////////////////////////////////
-/// \brief Get the number of channels used by this recorder
-///
-/// Currently only mono and stereo are supported, so the
-/// value is either 1 (for mono) or 2 (for stereo).
-///
-/// \param soundBufferRecorder Sound buffer recorder object
-///
-/// \return Number of channels
-///
-/// \see sfSoundBufferRecorder_setChannelCount
-///
-////////////////////////////////////////////////////////////
-CSFML_AUDIO_API unsigned int sfSoundBufferRecorder_getChannelCount(const sfSoundBufferRecorder* soundBufferRecorder);
-
 
 #endif // SFML_SOUNDBUFFERRECORDER_H

src/SFML/Audio/SoundBufferRecorder.cpp

@@ -90,17 +90,3 @@ const char* sfSoundBufferRecorder_getDevice(sfSoundBufferRecorder* soundBufferRe
 
     return soundBufferRecorder->DeviceName.c_str();
 }
-
-
-////////////////////////////////////////////////////////////
-void sfSoundBufferRecorder_setChannelCount(sfSoundBufferRecorder* soundBufferRecorder, unsigned int channelCount)
-{
-    CSFML_CALL(soundBufferRecorder, setChannelCount(channelCount));
-}
-
-
-////////////////////////////////////////////////////////////
-unsigned int sfSoundBufferRecorder_getChannelCount(const sfSoundBufferRecorder* soundBufferRecorder)
-{
-    CSFML_CALL_RETURN(soundBufferRecorder, getChannelCount(), 0);
-}

tools/nuget/build.macos.sh

@@ -168,7 +168,7 @@ fixrpath()
 }
 
 fixrpath audio "@rpath/../Frameworks/OpenAL.framework/Versions/A/OpenAL" "@rpath/OpenAL.framework/Versions/A/OpenAL"
-fixrpath audio "@rpath/../Frameworks/vorbisenc.framework/Versions/A/vorbisenc" "@rpath/vorbisenc.framework/Versions/A/vorbisenc"
+fixrpath audio "@rpath/../Frameworks/vorbisenc.framework/Versions/A/vorbisenc" "@rpath/vorbisenc.framework/Versions/A/vorbisen"
 fixrpath audio "@rpath/../Frameworks/vorbisfile.framework/Versions/A/vorbisfile" "@rpath/vorbisfile.framework/Versions/A/vorbisfile"
 fixrpath audio "@rpath/../Frameworks/vorbis.framework/Versions/A/vorbis" "@rpath/vorbis.framework/Versions/A/vorbis"
 fixrpath audio "@rpath/../Frameworks/ogg.framework/Versions/A/ogg" "@rpath/ogg.framework/Versions/A/ogg"

tools/nuget/build.win.ps1

@@ -115,10 +115,10 @@ New-Push SFML
 $SFMLBuiltDir = Get-Location # The directory where SFML was built to. Used later to direct cmake when building CSFML
 
 cmake `
-    '-DBUILD_SHARED_LIBS=0' `
+    '-DBUILD_SHARED_LIBS=1' `
     '-DCMAKE_BUILD_TYPE=Release' `
     '-DCMAKE_SYSTEM_VERSION=8.1' `
-    '-DSFML_USE_STATIC_STD_LIBS=1' `
+    '-DSFML_USE_STATIC_STD_LIBS=0' `
     '-DSFML_BUILD_NETWORK=0' `
     "-G$Generator" `
     "-A$Architecture" `
@@ -142,7 +142,7 @@ $CSFMLLibDir = (Get-Item lib).FullName; # The directory where the final CSFML dl
 
 cmake `
     "-DSFML_DIR=$SFMLBuiltDir" `
-    '-DCSFML_LINK_SFML_STATICALLY=1' `
+    '-DCSFML_LINK_SFML_STATICALLY=0' `
     "-DCMAKE_LIBRARY_PATH=$SFMLExtLibs" `
     `
     "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$CSFMLLibDir" `
@@ -193,6 +193,7 @@ function Copy-Module($module) {
     Write-Output "Copying CSFML $module"
 
     New-Item -ItemType Directory $OutDir -ErrorAction Ignore > $null
+    Copy-Item "$SFMLBuiltDir/bin/sfml-$module-2.dll" "$OutDir" -Force > $null
     Copy-Item "$CSFMLLibDir/csfml-$module-2.dll" "$OutDir/csfml-$module.dll" -Force > $null
 }