Add tests for sfListener

.github/workflows/nuget.yml

@@ -79,7 +79,7 @@ jobs:
                   path: CSFML
 
             - name: Build in an ARM container
-              uses: uraimo/run-on-arch-action@v2.8.1
+              uses: uraimo/run-on-arch-action@v2.7.2
               with:
                   arch: armv7
                   distro: ubuntu22.04
@@ -111,7 +111,7 @@ jobs:
                   path: CSFML
 
             - name: Build in an ARM64 container
-              uses: uraimo/run-on-arch-action@v2.8.1
+              uses: uraimo/run-on-arch-action@v2.7.2
               with:
                   arch: aarch64
                   distro: ubuntu22.04

.github/workflows/release.yml

@@ -1,314 +0,0 @@
-name: Release Builds
-
-on:
-    push:
-        branches:
-            - master
-            - 2.6.x
-        tags:
-            - "**"
-    workflow_dispatch: {}
-
-concurrency:
-    group: release-${{github.ref}}
-    cancel-in-progress: true
-
-jobs:
-    windows-x86:
-        name: Windows x86
-        runs-on: windows-2022
-
-        steps:
-            - name: Cache MinGW x86
-              id: mingw-x86-cache
-              uses: actions/cache@v4
-              with:
-                  path: ${{ github.workspace }}/mingw32
-                  key: 14.2.0posix-19.1.1-12.0.0-ucrt-r2-x86
-
-            - name: Install MinGW x86
-              if: steps.mingw-x86-cache.outputs.cache-hit != 'true'
-              uses: bwoodsend/setup-winlibs-action@v1
-              id: winlibs-32
-              with:
-                  tag: 14.2.0posix-19.1.1-12.0.0-ucrt-r2
-                  with_clang: false
-                  architecture: 32
-                  destination: ${{ github.workspace }}
-                  add_to_path: false
-
-            - name: Checkout SFML
-              uses: actions/checkout@v4
-              with:
-                  repository: SFML/SFML
-                  ref: 3.0.0
-                  path: SFML
-
-            - name: Checkout CSFML
-              uses: actions/checkout@v4
-              with:
-                  path: CSFML
-
-            - name: Build SFML
-              run: |
-                  cmake -S SFML -B SFML-build -A Win32 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=ON -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=ON -DCSFML_LINK_SFML_STATICALLY=OFF -DCMAKE_BUILD_TYPE=Release -DSFML_ROOT=${{ github.workspace }}/SFML-install -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
-                  cmake --build CSFML-build --config Release --target install
-            
-            - name: Add MinGW to PATH
-              shell: bash
-              run: echo "${{ github.workspace }}\mingw32\bin" >> $GITHUB_PATH
-
-            - name: Generate Import Libs for MinGW
-              shell: pwsh
-              run: |
-                  New-Item -ItemType "directory" -PATH "CSFML-install\lib\gcc"
-                  New-Item -ItemType "directory" -PATH "CSFML-install\lib\msvc"
-                  Move-Item -Path "CSFML-install\lib\*.lib" -Destination "CSFML-install\lib\msvc"
-
-                  Push-Location CSFML-install\lib\gcc
-                  & gendef.exe "..\..\bin\csfml-graphics-3.dll"
-                  & dlltool.exe -d "csfml-graphics-3.def" -D "..\..\bin\csfml-graphics-3.dll" -l "libcsfml-graphics.a"
-                  Remove-Item -Path "csfml-graphics-3.def"
-                  
-                  & gendef.exe "..\..\bin\csfml-window-3.dll"
-                  & dlltool.exe -d "csfml-window-3.def" -D "..\..\bin\csfml-window-3.dll" -l "libcsfml-window.a"
-                  Remove-Item -Path "csfml-window-3.def"
-                  
-                  & gendef.exe "..\..\bin\csfml-audio-3.dll"
-                  & dlltool.exe -d "csfml-audio-3.def" -D "..\..\bin\csfml-audio-3.dll" -l "libcsfml-audio.a"
-                  Remove-Item -Path "csfml-audio-3.def"
-                  
-                  & gendef.exe "..\..\bin\csfml-network-3.dll"
-                  & dlltool.exe -d "csfml-network-3.def" -D "..\..\bin\csfml-network-3.dll" -l "libcsfml-network.a"
-                  Remove-Item -Path "csfml-network-3.def"
-                  
-                  & gendef.exe "..\..\bin\csfml-system-3.dll"
-                  & dlltool.exe -d "csfml-system-3.def" -D "..\..\bin\csfml-system-3.dll" -l "libcsfml-system.a"
-                  Remove-Item -Path "csfml-system-3.def"
-                  Pop-Location
-
-                  New-Item -ItemType "directory" -PATH "install\CSFML"
-                  Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: CSFML-windows-32-bit
-                  path: install/CSFML
-
-    windows-x64:
-        name: Windows x64
-        runs-on: windows-2022
-
-        steps:
-            - name: Cache MinGW x64
-              id: mingw-x64-cache
-              uses: actions/cache@v4
-              with:
-                  path: ${{ github.workspace }}/mingw64
-                  key: 14.2.0posix-19.1.1-12.0.0-ucrt-r2-x64
-
-            - name: Install MinGW x64
-              if: steps.mingw-x64-cache.outputs.cache-hit != 'true'
-              uses: bwoodsend/setup-winlibs-action@v1
-              id: winlibs-64
-              with:
-                  tag: 14.2.0posix-19.1.1-12.0.0-ucrt-r2
-                  with_clang: false
-                  architecture: 64
-                  destination: ${{ github.workspace }}
-                  add_to_path: false
-
-            - name: Checkout SFML
-              uses: actions/checkout@v4
-              with:
-                  repository: SFML/SFML
-                  ref: 3.0.0
-                  path: SFML
-
-            - name: Checkout CSFML
-              uses: actions/checkout@v4
-              with:
-                  path: CSFML
-
-            - name: Build SFML
-              run: |
-                  cmake -S SFML -B SFML-build -A x64 -G "Visual Studio 17 2022" -DBUILD_SHARED_LIBS=ON -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=ON -DCSFML_LINK_SFML_STATICALLY=OFF -DCMAKE_BUILD_TYPE=Release -DSFML_ROOT=${{ github.workspace }}/SFML-install -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install -DCMAKE_VERBOSE_MAKEFILE=ON
-                  cmake --build CSFML-build --config Release --target install
-
-            - name: Add MinGW to PATH
-              shell: bash
-              run: echo "${{ github.workspace }}\mingw64\bin" >> $GITHUB_PATH
-
-            - name: Generate Import Libs for MinGW
-              shell: pwsh
-              run: |
-                  New-Item -ItemType "directory" -PATH "CSFML-install\lib\gcc"
-                  New-Item -ItemType "directory" -PATH "CSFML-install\lib\msvc"
-                  Move-Item -Path "CSFML-install\lib\*.lib" -Destination "CSFML-install\lib\msvc"
-
-                  Push-Location CSFML-install\lib\gcc
-                  & gendef.exe "..\..\bin\csfml-graphics-3.dll"
-                  & dlltool.exe -d "csfml-graphics-3.def" -D "..\..\bin\csfml-graphics-3.dll" -l "libcsfml-graphics.a"
-                  Remove-Item -Path "csfml-graphics-3.def"
-                  
-                  & gendef.exe "..\..\bin\csfml-window-3.dll"
-                  & dlltool.exe -d "csfml-window-3.def" -D "..\..\bin\csfml-window-3.dll" -l "libcsfml-window.a"
-                  Remove-Item -Path "csfml-window-3.def"
-                  
-                  & gendef.exe "..\..\bin\csfml-audio-3.dll"
-                  & dlltool.exe -d "csfml-audio-3.def" -D "..\..\bin\csfml-audio-3.dll" -l "libcsfml-audio.a"
-                  Remove-Item -Path "csfml-audio-3.def"
-                  
-                  & gendef.exe "..\..\bin\csfml-network-3.dll"
-                  & dlltool.exe -d "csfml-network-3.def" -D "..\..\bin\csfml-network-3.dll" -l "libcsfml-network.a"
-                  Remove-Item -Path "csfml-network-3.def"
-                  
-                  & gendef.exe "..\..\bin\csfml-system-3.dll"
-                  & dlltool.exe -d "csfml-system-3.def" -D "..\..\bin\csfml-system-3.dll" -l "libcsfml-system.a"
-                  Remove-Item -Path "csfml-system-3.def"
-                  Pop-Location
-
-                  New-Item -ItemType "directory" -PATH "install\CSFML"
-                  Move-Item -Path "CSFML-install\*" -Destination "install\CSFML"
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: CSFML-windows-64-bit
-                  path: install/CSFML
-
-    macos-x64:
-        name: macOS x64
-        runs-on: macos-13
-
-        steps:
-            - name: Checkout SFML
-              uses: actions/checkout@v4
-              with:
-                  repository: SFML/SFML
-                  ref: 3.0.0
-                  path: SFML
-
-            - name: Checkout CSFML
-              uses: actions/checkout@v4
-              with:
-                  path: CSFML
-
-            - name: Build SFML
-              run: |
-                  cmake -S SFML -B SFML-build -G "Unix Makefiles" \
-                        -DCMAKE_C_COMPILER="/usr/bin/clang" \
-                        -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
-                        -DCMAKE_C_FLAGS="-stdlib=libc++" \
-                        -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-                        -DBUILD_SHARED_LIBS=ON \
-                        -DCMAKE_BUILD_TYPE=Release \
-                        -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
-                        -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-                        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-                        -DSFML_BUILD_FRAMEWORKS=OFF \
-                        -DCMAKE_VERBOSE_MAKEFILE=ON
-                  cmake --build SFML-build --config Release --target install
-
-            - name: Build CSFML
-              run: |
-                  cmake -S CSFML -B CSFML-build -G "Unix Makefiles" \
-                        -DCMAKE_C_COMPILER="/usr/bin/clang" \
-                        -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
-                        -DCMAKE_C_FLAGS="-stdlib=libc++" \
-                        -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-                        -DBUILD_SHARED_LIBS=ON \
-                        -DCMAKE_BUILD_TYPE=Release \
-                        -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
-                        -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-                        -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-                        -DSFML_ROOT=${{ github.workspace }}/SFML-install \
-                        -DCMAKE_VERBOSE_MAKEFILE=ON
-                  cmake --build CSFML-build --config Release --target install
-
-            - name: Create Archive
-              run: |
-                  mkdir CSFML-macOS-clang-64-bit
-                  cp -R CSFML-install/include CSFML-macOS-clang-64-bit
-                  cp -R CSFML-install/lib CSFML-macOS-clang-64-bit
-                  cp CSFML-install/share/CSFML/* CSFML-macOS-clang-64-bit
-                  tar -zcvf CSFML-macOS-clang-64-bit.tar.gz CSFML-macOS-clang-64-bit
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: CSFML-macOS-clang-64-bit
-                  path: CSFML-macOS-clang-64-bit.tar.gz
-
-    macos-arm64:
-        name: macOS ARM64
-        runs-on: macos-14
-
-        steps:
-            - name: Checkout SFML
-              uses: actions/checkout@v4
-              with:
-                  repository: SFML/SFML
-                  ref: 3.0.0
-                  path: SFML
-
-            - name: Checkout CSFML
-              uses: actions/checkout@v4
-              with:
-                  path: CSFML
-            - name: Build SFML
-              run: |
-                  cmake -S SFML -B SFML-build -G "Unix Makefiles" \
-                        -DCMAKE_C_COMPILER="/usr/bin/clang" \
-                        -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
-                        -DCMAKE_C_FLAGS="-stdlib=libc++" \
-                        -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-                        -DBUILD_SHARED_LIBS=ON \
-                        -DCMAKE_BUILD_TYPE=Release \
-                        -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/SFML-install \
-                        -DCMAKE_OSX_ARCHITECTURES=arm64 \
-                        -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
-                        -DSFML_BUILD_FRAMEWORKS=OFF \
-                        -DCMAKE_VERBOSE_MAKEFILE=ON
-                  cmake --build SFML-build --config Release --target install
-
-            - name: Build CSFML
-              run: |
-                  cmake -S CSFML -B CSFML-build -G "Unix Makefiles" \
-                        -DCMAKE_C_COMPILER="/usr/bin/clang" \
-                        -DCMAKE_CXX_COMPILER="/usr/bin/clang++" \
-                        -DCMAKE_C_FLAGS="-stdlib=libc++" \
-                        -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-                        -DBUILD_SHARED_LIBS=ON \
-                        -DCMAKE_BUILD_TYPE=Release \
-                        -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/CSFML-install \
-                        -DCMAKE_OSX_ARCHITECTURES=arm64 \
-                        -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 \
-                        -DSFML_ROOT=${{ github.workspace }}/SFML-install \
-                        -DCMAKE_VERBOSE_MAKEFILE=ON
-                  cmake --build CSFML-build --config Release --target install
-
-            - name: Create Archive
-              run: |
-                  mkdir CSFML-macOS-clang-arm64
-                  cp -R CSFML-install/include CSFML-macOS-clang-arm64
-                  cp -R CSFML-install/lib CSFML-macOS-clang-arm64
-                  cp CSFML-install/share/CSFML/* CSFML-macOS-clang-arm64
-                  tar -zcvf CSFML-macOS-clang-arm64.tar.gz CSFML-macOS-clang-arm64
-
-            - name: Upload Artifact
-              uses: actions/upload-artifact@v4
-              with:
-                  name: CSFML-macOS-clang-arm64
-                  path: CSFML-macOS-clang-arm64.tar.gz

doc/CMakeLists.txt

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

include/CSFML/Graphics/View.h

@@ -191,7 +191,7 @@ CSFML_GRAPHICS_API sfFloatRect sfView_getViewport(const sfView* view);
 CSFML_GRAPHICS_API sfFloatRect sfView_getScissor(const sfView* view);
 
 ////////////////////////////////////////////////////////////
-/// \brief Move a view relative to its current position
+/// \brief Move a view relatively to its current position
 ///
 /// \param view   View object
 /// \param offset Offset
@@ -200,7 +200,7 @@ CSFML_GRAPHICS_API sfFloatRect sfView_getScissor(const sfView* view);
 CSFML_GRAPHICS_API void sfView_move(sfView* view, sfVector2f offset);
 
 ////////////////////////////////////////////////////////////
-/// \brief Rotate a view relative to its current orientation
+/// \brief Rotate a view relatively to its current orientation
 ///
 /// \param view  View object
 /// \param angle Angle to rotate, in degrees
@@ -209,7 +209,7 @@ CSFML_GRAPHICS_API void sfView_move(sfView* view, sfVector2f offset);
 CSFML_GRAPHICS_API void sfView_rotate(sfView* view, float angle);
 
 ////////////////////////////////////////////////////////////
-/// \brief Resize a view rectangle relative to its current size
+/// \brief Resize a view rectangle relatively to its current size
 ///
 /// Resizing the view simulates a zoom, as the zone displayed on
 /// screen grows or shrinks.

include/CSFML/Network/IpAddress.h

@@ -132,7 +132,7 @@ CSFML_NETWORK_API void sfIpAddress_toString(sfIpAddress address, char* string);
 /// address, and should be used for optimization purposes only
 /// (like sending the address through a socket).
 /// The integer produced by this function can then be converted
-/// back to a sfIpAddress with sfIpAddress_fromInteger.
+/// back to a sfIpAddress with sfIpAddress_FromInteger.
 ///
 /// \param address Address object
 ///

include/CSFML/Network/Packet.h

@@ -75,8 +75,6 @@ CSFML_NETWORK_API void sfPacket_append(sfPacket* packet, const void* data, size_
 ///
 /// The next read operation will read data from this position
 ///
-/// \param packet Packet object
-///
 /// \return The byte offset of the current read position
 ///
 /// \see append
@@ -165,8 +163,6 @@ CSFML_NETWORK_API int16_t  sfPacket_readInt16(sfPacket* packet);
 CSFML_NETWORK_API uint16_t sfPacket_readUint16(sfPacket* packet);
 CSFML_NETWORK_API int32_t  sfPacket_readInt32(sfPacket* packet);
 CSFML_NETWORK_API uint32_t sfPacket_readUint32(sfPacket* packet);
-CSFML_NETWORK_API int64_t  sfPacket_readInt64(sfPacket* packet);
-CSFML_NETWORK_API uint64_t sfPacket_readUint64(sfPacket* packet);
 CSFML_NETWORK_API float    sfPacket_readFloat(sfPacket* packet);
 CSFML_NETWORK_API double   sfPacket_readDouble(sfPacket* packet);
 CSFML_NETWORK_API void     sfPacket_readString(sfPacket* packet, char* string);
@@ -185,8 +181,6 @@ CSFML_NETWORK_API void sfPacket_writeInt16(sfPacket* packet, int16_t);
 CSFML_NETWORK_API void sfPacket_writeUint16(sfPacket* packet, uint16_t);
 CSFML_NETWORK_API void sfPacket_writeInt32(sfPacket* packet, int32_t);
 CSFML_NETWORK_API void sfPacket_writeUint32(sfPacket* packet, uint32_t);
-CSFML_NETWORK_API void sfPacket_writeInt64(sfPacket* packet, int64_t);
-CSFML_NETWORK_API void sfPacket_writeUint64(sfPacket* packet, uint64_t);
 CSFML_NETWORK_API void sfPacket_writeFloat(sfPacket* packet, float);
 CSFML_NETWORK_API void sfPacket_writeDouble(sfPacket* packet, double);
 CSFML_NETWORK_API void sfPacket_writeString(sfPacket* packet, const char* string);

include/CSFML/Network/TcpListener.h

@@ -99,10 +99,6 @@ CSFML_NETWORK_API unsigned short sfTcpListener_getLocalPort(const sfTcpListener*
 /// If the socket was previously listening to another port,
 /// it will be stopped first and bound to the new port.
 ///
-/// When providing `sfTcpListener_anyPort()` as port, the listener
-/// will request an available port from the system.
-/// The chosen port can be retrieved by calling `sfTcpListener_getLocalPort()`.
-///
 /// If there is no specific address to listen to, pass sfIpAddress_Any
 ///
 /// \param listener TCP listener object
@@ -114,17 +110,6 @@ CSFML_NETWORK_API unsigned short sfTcpListener_getLocalPort(const sfTcpListener*
 ////////////////////////////////////////////////////////////
 CSFML_NETWORK_API sfSocketStatus sfTcpListener_listen(sfTcpListener* listener, unsigned short port, sfIpAddress address);
 
-////////////////////////////////////////////////////////////
-/// \brief Stop listening and close the socket
-///
-/// This function gracefully stops the listener. If the
-/// socket is not listening, this function has no effect.
-///
-/// \param listener  TCP listener object
-///
-////////////////////////////////////////////////////////////
-CSFML_NETWORK_API void sfTcpListener_close(sfTcpListener* listener);
-
 ////////////////////////////////////////////////////////////
 /// \brief Accept a new connection
 ///
@@ -142,12 +127,3 @@ CSFML_NETWORK_API void sfTcpListener_close(sfTcpListener* listener);
 ///
 ////////////////////////////////////////////////////////////
 CSFML_NETWORK_API sfSocketStatus sfTcpListener_accept(sfTcpListener* listener, sfTcpSocket** connected);
-
-////////////////////////////////////////////////////////////
-/// \brief Return the special value that tells the system
-///        to pick any available port
-///
-/// \return The value to use for any port
-///
-////////////////////////////////////////////////////////////
-CSFML_NETWORK_API unsigned short sfTcpListener_anyPort(void);

include/CSFML/Network/UdpSocket.h

@@ -102,10 +102,6 @@ CSFML_NETWORK_API unsigned short sfUdpSocket_getLocalPort(const sfUdpSocket* soc
 /// system to automatically pick an available port, and then
 /// call sfUdpSocket_getLocalPort to retrieve the chosen port.
 ///
-/// When providing `sfUdpSocket_anyPort()` as port, the listener
-/// will request an available port from the system.
-/// The chosen port can be retrieved by calling `sfUdpSocket_getLocalPort()`.
-///
 /// If there is no specific address to listen to, pass sfIpAddress_Any
 ///
 /// \param socket  UDP socket object
@@ -219,12 +215,3 @@ CSFML_NETWORK_API sfSocketStatus
 ///
 ////////////////////////////////////////////////////////////
 CSFML_NETWORK_API unsigned int sfUdpSocket_maxDatagramSize(void);
-
-////////////////////////////////////////////////////////////
-/// \brief Return the special value that tells the system
-///        to pick any available port
-///
-/// \return The value to use for any port
-///
-////////////////////////////////////////////////////////////
-CSFML_NETWORK_API unsigned short sfUdpSocket_anyPort(void);

src/CSFML/Network/IpAddress.cpp

@@ -48,7 +48,7 @@ namespace
 
 
 ////////////////////////////////////////////////////////////
-const sfIpAddress sfIpAddress_None = {{0}};
+const sfIpAddress sfIpAddress_None = sfIpAddress_fromBytes(0, 0, 0, 0);
 
 
 ////////////////////////////////////////////////////////////

src/CSFML/Network/Packet.cpp

@@ -156,20 +156,6 @@ uint32_t sfPacket_readUint32(sfPacket* packet)
     *packet >> value;
     return value;
 }
-int64_t sfPacket_readInt64(sfPacket* packet)
-{
-    assert(packet);
-    int64_t value = 0;
-    *packet >> value;
-    return value;
-}
-uint64_t sfPacket_readUint64(sfPacket* packet)
-{
-    assert(packet);
-    uint64_t value = 0;
-    *packet >> value;
-    return value;
-}
 float sfPacket_readFloat(sfPacket* packet)
 {
     assert(packet);
@@ -233,16 +219,6 @@ void sfPacket_writeUint32(sfPacket* packet, uint32_t value)
     assert(packet);
     *packet << value;
 }
-void sfPacket_writeInt64(sfPacket* packet, int64_t value)
-{
-    assert(packet);
-    *packet << value;
-}
-void sfPacket_writeUint64(sfPacket* packet, uint64_t value)
-{
-    assert(packet);
-    *packet << value;
-}
 void sfPacket_writeFloat(sfPacket* packet, float value)
 {
     assert(packet);

src/CSFML/Network/TcpListener.cpp

@@ -86,14 +86,6 @@ sfSocketStatus sfTcpListener_listen(sfTcpListener* listener, unsigned short port
 }
 
 
-////////////////////////////////////////////////////////////
-void sfTcpListener_close(sfTcpListener* listener)
-{
-    assert(listener);
-    listener->close();
-}
-
-
 ////////////////////////////////////////////////////////////
 sfSocketStatus sfTcpListener_accept(sfTcpListener* listener, sfTcpSocket** connected)
 {
@@ -110,10 +102,3 @@ sfSocketStatus sfTcpListener_accept(sfTcpListener* listener, sfTcpSocket** conne
 
     return status;
 }
-
-
-////////////////////////////////////////////////////////////
-unsigned short sfTcpListener_anyPort()
-{
-    return 0;
-}

src/CSFML/Network/UdpSocket.cpp

@@ -203,10 +203,3 @@ unsigned int sfUdpSocket_maxDatagramSize()
 {
     return sf::UdpSocket::MaxDatagramSize;
 }
-
-
-////////////////////////////////////////////////////////////
-unsigned short sfUdpSocket_anyPort()
-{
-    return 0;
-}

test/Audio/Listener.test.cpp

@@ -0,0 +1,86 @@
+#include <CSFML/Audio/Listener.h>
+
+#include <catch2/catch_test_macros.hpp>
+
+TEST_CASE("[Audio] sfListener")
+{
+    SECTION("sfListenerCone")
+    {
+        constexpr sfListenerCone cone{};
+        STATIC_CHECK(cone.innerAngle == 0);
+        STATIC_CHECK(cone.outerAngle == 0);
+        STATIC_CHECK(cone.outerGain == 0);
+    }
+
+    SECTION("Set/get global volume")
+    {
+        CHECK(sfListener_getGlobalVolume() == 100);
+        sfListener_setGlobalVolume(42);
+        CHECK(sfListener_getGlobalVolume() == 42);
+    }
+
+    SECTION("Set/get position")
+    {
+        sfVector3f position = sfListener_getPosition();
+        CHECK(position.x == 0);
+        CHECK(position.y == 0);
+        CHECK(position.z == 0);
+        sfListener_setPosition({3, 4, 5});
+        position = sfListener_getPosition();
+        CHECK(position.x == 3);
+        CHECK(position.y == 4);
+        CHECK(position.z == 5);
+    }
+
+    SECTION("Set/get direction")
+    {
+        sfVector3f direction = sfListener_getDirection();
+        CHECK(direction.x == 0);
+        CHECK(direction.y == 0);
+        CHECK(direction.z == -1);
+        sfListener_setDirection({6, 7, 8});
+        direction = sfListener_getDirection();
+        CHECK(direction.x == 6);
+        CHECK(direction.y == 7);
+        CHECK(direction.z == 8);
+    }
+
+    SECTION("Set/get velocity")
+    {
+        sfVector3f velocity = sfListener_getVelocity();
+        CHECK(velocity.x == 0);
+        CHECK(velocity.y == 0);
+        CHECK(velocity.z == 0);
+        sfListener_setVelocity({9, 10, 11});
+        velocity = sfListener_getVelocity();
+        CHECK(velocity.x == 9);
+        CHECK(velocity.y == 10);
+        CHECK(velocity.z == 11);
+    }
+
+    SECTION("Set/get cone")
+    {
+        sfListenerCone cone = sfListener_getCone();
+        CHECK(cone.innerAngle == 360);
+        CHECK(cone.outerAngle == 360);
+        CHECK(cone.outerGain == 1);
+        sfListener_setCone({15, 30, 0.5f});
+        cone = sfListener_getCone();
+        CHECK(cone.innerAngle == 15);
+        CHECK(cone.outerAngle == 30);
+        CHECK(cone.outerGain == 0.5f);
+    }
+
+    SECTION("Set/get up vector")
+    {
+        sfVector3f upVector = sfListener_getUpVector();
+        CHECK(upVector.x == 0);
+        CHECK(upVector.y == 1);
+        CHECK(upVector.z == 0);
+        sfListener_setUpVector({12, 13, 14});
+        upVector = sfListener_getUpVector();
+        CHECK(upVector.x == 12);
+        CHECK(upVector.y == 13);
+        CHECK(upVector.z == 14);
+    }
+}

test/CMakeLists.txt

@@ -72,6 +72,7 @@ set_target_warnings(test-csfml-network)
 catch_discover_tests(test-csfml-network)
 
 add_executable(test-csfml-audio
+    Audio/Listener.test.cpp
     Audio/SoundChannel.test.cpp
 )
 target_link_libraries(test-csfml-audio PRIVATE csfml-audio Catch2::Catch2WithMain SFML::Audio)

test/Network/IpAddress.test.cpp

@@ -2,8 +2,6 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <cstring>
-
 TEST_CASE("[Network] sfIpAddress")
 {
     SECTION("Constants")
@@ -12,11 +10,6 @@ TEST_CASE("[Network] sfIpAddress")
         CHECK(sfIpAddress_toInteger(sfIpAddress_Any) == 0);
         CHECK(sfIpAddress_toInteger(sfIpAddress_LocalHost) == 0x7F000001);
         CHECK(sfIpAddress_toInteger(sfIpAddress_Broadcast) == 0xFFFFFFFF);
-
-        CHECK(std::strcmp(sfIpAddress_None.address, "") == 0);
-        CHECK(std::strcmp(sfIpAddress_Any.address, "0.0.0.0") == 0);
-        CHECK(std::strcmp(sfIpAddress_LocalHost.address, "127.0.0.1") == 0);
-        CHECK(std::strcmp(sfIpAddress_Broadcast.address, "255.255.255.255") == 0);
     }
 
     SECTION("sfIpAddress_fromString")

tools/BuildMacOS.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-VERSION="3.0.0"
-VERSION_C="3.0.0"
+VERSION="2.6.1"
+VERSION_C="2.6.0"
 # BUILD_CSFML=FALSE
 BUILD_CSFML=TRUE
 BUILD_SFML=FALSE

tools/nuget/build.linux.sh

@@ -42,7 +42,7 @@ echo "Please note that all SFML dependencies must be installed and available to
 
 RID="$1"
 
-SFMLBranch="3.0.0" # The branch or tag of the SFML repository to be cloned
+SFMLBranch="master" # The branch or tag of the SFML repository to be cloned
 CSFMLDir="$(realpath ../../)"  # The directory of the source code of CSFML
 
 OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries

tools/nuget/build.macos.sh

@@ -46,7 +46,7 @@ echo "Please note that all SFML dependencies must be installed and available to
 
 RID="$1"
 
-SFMLBranch="3.0.0" # The branch or tag of the SFML repository to be cloned
+SFMLBranch="master" # The branch or tag of the SFML repository to be cloned
 CSFMLDir="$(grealpath "$(git rev-parse --show-toplevel)")" # The directory of the source code of CSFML
 
 OutDir="./CSFML/runtimes/$RID/native" # The base directory of all CSFML modules, used to copy the final libraries
@@ -146,12 +146,39 @@ cmake -E env \
           "$CSFMLDir"
 cmake --build . --config Release --target install
 
-# ======================================== #
-# STEP 5: Copy result to the NuGet folders #
-# ======================================== #
+# ============================ #
+# STEP 5: Fix RPATH references #
+# ============================ #
 
 SFMLMajorMinor="3.0"
 SFMLMajorMinorPatch="$SFMLMajorMinor.0"
+
+# SFML's framework dependencies will always reference @rpath/../Frameworks/<depedency>
+# Which is not where we place the frameworks and where SFML should look for them
+# This this fixes the dependency with install_name_tool
+fixrpath()
+{
+    MODULE="$1"
+    OLD="$2"
+    NEW="$3"
+
+    install_name_tool -change $OLD $NEW "$SFMLLibDir/libsfml-$MODULE.dylib"
+    install_name_tool -change $OLD $NEW "$SFMLLibDir/libsfml-$MODULE.$SFMLMajorMinor.dylib"
+    install_name_tool -change $OLD $NEW "$SFMLLibDir/libsfml-$MODULE.$SFMLMajorMinorPatch.dylib"
+}
+
+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"
+fixrpath audio "@rpath/../Frameworks/FLAC.framework/Versions/A/FLAC" "@rpath/FLAC.framework/Versions/A/FLAC"
+
+fixrpath graphics "@rpath/../Frameworks/freetype.framework/Versions/A/freetype" "@rpath/freetype.framework/Versions/A/freetype"
+
+# ======================================== #
+# STEP 6: Copy result to the NuGet folders #
+# ======================================== #
+
 CSFMLMajorMinor="3.0"
 CSFMLMajorMinorPatch="$CSFMLMajorMinor.0"
 
@@ -181,6 +208,8 @@ copymodule graphics
 copymodule system
 copymodule window
 
+cp -R "$SFMLLibDir/lib/"*.framework "$OutDir"
+
 popd # Pop CSFML
 popd # Pop $RID
 popd # Pop Build

tools/nuget/build.win.ps1

@@ -35,7 +35,7 @@ Write-Output "Building $RID"
 Write-Output "Using $Generator as the cmake generator"
 Write-Output "Using architecture $Architecture"
 
-$SFMLBranch = "3.0.0" # The branch or tag of the SFML repository to be cloned
+$SFMLBranch = "master" # The branch or tag of the SFML repository to be cloned
 $CSFMLDir = (Get-Item (git rev-parse --show-toplevel)).FullName # The directory of the source code of CSFML
 
 $OutDir = "./CSFML/runtimes/$RID/native" # The directory of all CSFML modules, used to copy the final dlls
@@ -83,9 +83,17 @@ Push-Location "SFML"
 
 $SFMLDir = (Get-Item .).FullName
 
-IF ($RID -ne 'win-x86' -and $RID -ne 'win-x64') {
-    Write-Error "Unknown RID '$RID'"
-    exit
+switch ($RID) {
+    'win-x86' {
+        $SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x86).FullName
+    }
+    'win-x64' {
+        $SFMLExtLibs = (Get-Item ./extlibs/libs-msvc-universal/x64).FullName
+    }
+    Default {
+        Write-Error "Unknown RID '$RID'"
+        exit
+    }
 }
 
 Pop-Location # Pop SFML
@@ -134,6 +142,7 @@ $CSFMLLibDir = (Get-Item lib).FullName; # The directory where the final CSFML dl
 cmake `
     "-DSFML_ROOT=$SFMLInstallDir" `
     '-DCSFML_LINK_SFML_STATICALLY=OFF' `
+    "-DCMAKE_LIBRARY_PATH=$SFMLExtLibs" `
     `
     "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$CSFMLLibDir" `
     "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE=$CSFMLLibDir" `