use sockpp

PPUC · Mar 6, 2024 · 49a7bf0 · 49a7bf0
1 parent 200f76f
commit 49a7bf0
Show file tree

Hide file tree

Showing 14 changed files with 276 additions and 195 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,30 +96,30 @@ if(BUILD_SHARED)
          third-party/runtime-libs/${PLATFORM}/${ARCH}
       )
       if(ARCH STREQUAL "x64")
-         target_link_libraries(dmdutil_shared PUBLIC zedmd64 serum64 libserialport64 ws2_32)
+         target_link_libraries(dmdutil_shared PUBLIC zedmd64 serum64 libserialport64 sockpp ws2_32)
       else()
-        target_link_libraries(dmdutil_shared PUBLIC zedmd serum libserialport ws2_32)
+        target_link_libraries(dmdutil_shared PUBLIC zedmd serum libserialport sockpp ws2_32)
       endif()
    elseif(PLATFORM STREQUAL "macos")
       target_link_directories(dmdutil_shared PUBLIC
          third-party/runtime-libs/${PLATFORM}/${ARCH}
       )
-      target_link_libraries(dmdutil_shared PUBLIC zedmd.0.6.0 serum.1.6.2 serialport)
+      target_link_libraries(dmdutil_shared PUBLIC zedmd.0.6.0 serum.1.6.2 serialport sockpp.1.0.0)
    elseif(PLATFORM STREQUAL "linux")
       target_link_directories(dmdutil_shared PUBLIC
          third-party/runtime-libs/${PLATFORM}/${ARCH}
       )
-      target_link_libraries(dmdutil_shared PUBLIC -l:libzedmd.so.0.6.0 -l:libserum.so.1.6.2 -l:libserialport.so.0)
+      target_link_libraries(dmdutil_shared PUBLIC -l:libzedmd.so.0.6.0 -l:libserum.so.1.6.2 -l:libserialport.so.0 -l:libsockpp.so.1.0.0)
    elseif(PLATFORM STREQUAL "ios" OR PLATFORM STREQUAL "tvos")
       target_link_directories(dmdutil_shared PUBLIC
          third-party/build-libs/${PLATFORM}/${ARCH}
       )
-      target_link_libraries(dmdutil_shared PUBLIC zedmd serum)
+      target_link_libraries(dmdutil_shared PUBLIC zedmd serum sockpp)
    elseif(PLATFORM STREQUAL "android")
       target_link_directories(dmdutil_shared PUBLIC
          third-party/runtime-libs/${PLATFORM}/${ARCH}
       )
-      target_link_libraries(dmdutil_shared PUBLIC zedmd serum)
+      target_link_libraries(dmdutil_shared PUBLIC zedmd serum sockpp)
    endif()
 
    if(PLATFORM STREQUAL "win" AND ARCH STREQUAL "x64")
@@ -157,35 +157,39 @@ if(BUILD_SHARED)
       if(POST_BUILD_COPY_EXT_LIBS)
          if(PLATFORM STREQUAL "win")
             if(ARCH STREQUAL "x64")
-               add_custom_command(TARGET dmdutil_test POST_BUILD
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/zedmd64.lib" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/zedmd64.dll" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/serum64.lib" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/serum64.dll" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/libserialport64.lib" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserialport64.dll" "$<TARGET_FILE_DIR:dmdutil_test>"
+               add_custom_command(TARGET dmdserver POST_BUILD
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/zedmd64.lib" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/zedmd64.dll" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/serum64.lib" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/serum64.dll" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/libserialport64.lib" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserialport64.dll" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/sockpp.dll" "$<TARGET_FILE_DIR:dmdserver>"
                )
             else()
-               add_custom_command(TARGET dmdutil_test POST_BUILD
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/zedmd.lib" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/zedmd.dll" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/serum.lib" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/serum.dll" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/libserialport.lib" "$<TARGET_FILE_DIR:dmdutil_test>"
-                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserialport.dll" "$<TARGET_FILE_DIR:dmdutil_test>"
+               add_custom_command(TARGET dmdserver POST_BUILD
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/zedmd.lib" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/zedmd.dll" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/serum.lib" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/serum.dll" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/build-libs/${PLATFORM}/${ARCH}/libserialport.lib" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserialport.dll" "$<TARGET_FILE_DIR:dmdserver>"
+                  COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/sockpp.dll" "$<TARGET_FILE_DIR:dmdserver>"
                )
             endif()
          elseif(PLATFORM STREQUAL "macos")
-            add_custom_command(TARGET dmdutil_test POST_BUILD
-               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libzedmd.0.6.0.dylib" "$<TARGET_FILE_DIR:dmdutil_test>"
-               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserum.1.6.2.dylib" "$<TARGET_FILE_DIR:dmdutil_test>"
-               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserialport.dylib" "$<TARGET_FILE_DIR:dmdutil_test>"
+            add_custom_command(TARGET dmdserver POST_BUILD
+               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libzedmd.0.6.0.dylib" "$<TARGET_FILE_DIR:dmdserver>"
+               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserum.1.6.2.dylib" "$<TARGET_FILE_DIR:dmdserver>"
+               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserialport.dylib" "$<TARGET_FILE_DIR:dmdserver>"
+               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/sockpp.1.0.0.dylib" "$<TARGET_FILE_DIR:dmdserver>"
             )
          elseif(PLATFORM STREQUAL "linux")
-            add_custom_command(TARGET dmdutil_test POST_BUILD
-               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libzedmd.so.0.6.0" "$<TARGET_FILE_DIR:dmdutil_test>"
-               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserum.so.1.6.2" "$<TARGET_FILE_DIR:dmdutil_test>"
-               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserialport.so.0" "$<TARGET_FILE_DIR:dmdutil_test>"
+            add_custom_command(TARGET dmdserver POST_BUILD
+               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libzedmd.so.0.6.0" "$<TARGET_FILE_DIR:dmdserver>"
+               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserum.so.1.6.2" "$<TARGET_FILE_DIR:dmdserver>"
+               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libserialport.so.0" "$<TARGET_FILE_DIR:dmdserver>"
+               COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_SOURCE_DIR}/third-party/runtime-libs/${PLATFORM}/${ARCH}/libsockpp.so.1" "$<TARGET_FILE_DIR:dmdserver>"
             )
          endif()
       endif()

diff --git a/include/DMDUtil/DMD.h b/include/DMDUtil/DMD.h
@@ -20,17 +20,14 @@
 #include <shared_mutex>
 #include <string>
 #include <thread>
+#include "sockpp/tcp_connector.h"
 
 #if defined(__APPLE__)
 #include <TargetConditionals.h>
 #endif
 
 class ZeDMD;
 
-namespace CppSockets {
-  class TcpClient;
-}
-
 namespace DMDUtil
 {
 
@@ -77,6 +74,7 @@ class DMDUTILAPI DMD
     AlphaNumeric
   };
 
+#pragma pack(push, 1) // Align to 1-byte boundaries, important for sending over socket.
   struct Update
   {
     Mode mode;
@@ -98,13 +96,14 @@ class DMDUTILAPI DMD
 
   struct StreamHeader
   {
-    const char protocol[10] = "DMDStream";
+    char protocol[10] = "DMDStream";
     uint8_t version = 1;
-    Mode mode = Mode::Data; // int
+    Mode mode = Mode::Data;  // int
     uint16_t width = 0;
     uint16_t height = 0;
     uint32_t length = 0;
   };
+#pragma pack(pop) // Reset to default packing
 
   bool ConnectDMDServer();
   void FindDisplays();
@@ -126,7 +125,7 @@ class DMDUTILAPI DMD
   void UpdateRGB16Data(const uint16_t* pData, uint16_t width, uint16_t height);
   void UpdateAlphaNumericData(AlphaNumericLayout layout, const uint16_t* pData1, const uint16_t* pData2, uint8_t r,
                               uint8_t g, uint8_t b, const char* name = nullptr);
-  void QueueUpdate(Update* pUpdate);
+  void QueueUpdate(Update dmdUpdate);
 
  private:
   Update* m_updateBuffer[DMDUTIL_FRAME_BUFFER_SIZE];
@@ -151,7 +150,7 @@ class DMDUTILAPI DMD
   std::vector<LevelDMD*> m_levelDMDs;
   std::vector<RGB24DMD*> m_rgb24DMDs;
   std::vector<ConsoleDMD*> m_consoleDMDs;
-  CppSockets::TcpClient* m_pDMDServerClient;
+  sockpp::tcp_connector* m_pDMDServerConnector;
 
   std::thread* m_pLevelDMDThread;
   std::thread* m_pRGB24DMDThread;

diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -4,6 +4,7 @@ set -e
 
 LIBZEDMD_SHA=08e98a858eb6e1394b4844bec7dd27c7c0d9a845
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
+LIBLIBSOCKPP_SHA=4a0d8e087452b5c74179b268c0aceadef90906b9
 
 if [[ $(uname) == "Linux" ]]; then
    NUM_PROCS=$(nproc)
@@ -16,7 +17,7 @@ fi
 echo "Building libraries..."
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  CPPSOCKETS_SHA: ${CPPSOCKETS_SHA}"
+echo "  LIBSOCKPP_SHA: ${LIBSOCKPP_SHA}"
 echo ""
 
 if [ -z "${BUILD_TYPE}" ]; then
@@ -38,11 +39,11 @@ cd external
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-cp src/ZeDMD.h ../../third-party/include
+cp src/ZeDMD.h ../../third-party/include/
 platforms/android/arm64-v8a/external.sh
 cmake -DPLATFORM=android -DARCH=arm64-v8a -DBUILD_SHARED=ON -DBUILD_STATIC=OFF -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B build
 cmake --build build -- -j${NUM_PROCS}
-cp build/libzedmd.so ../../third-party/runtime-libs/android/arm64-v8a
+cp build/libzedmd.so ../../third-party/runtime-libs/android/arm64-v8a/
 cp -r test ../../
 cd ..
 
@@ -53,18 +54,21 @@ cd ..
 curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip
 unzip libserum.zip
 cd libserum-$LIBSERUM_SHA
-cp src/serum-decode.h ../../third-party/include
+cp src/serum-decode.h ../../third-party/include/
 cmake -DPLATFORM=android -DARCH=arm64-v8a -DBUILD_SHARED=ON -DBUILD_STATIC=OFF -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B build
 cmake --build build -- -j${NUM_PROCS}
-cp build/libserum.so ../../third-party/runtime-libs/android/arm64-v8a
+cp build/libserum.so ../../third-party/runtime-libs/android/arm64-v8a/
 cd ..
 
 #
-# build CppSockets and copy to external
+# build libsockpp and copy to external
 #
 
-curl -sL https://github.com/fredlllll/CppSockets/archive/${CPPSOCKETS_SHA}.zip -o CppSockets.zip
-unzip CppSockets.zip
-cd CppSockets-$CPPSOCKETS_SHA
-cp *.hpp ../../third-party/include/
+curl -sL https://github.com/fpagliughi/sockpp/archive/${LIBSOCKPP_SHA}.zip -o sockpp.zip
+unzip sockpp.zip
+cd sockpp-$LIBSOCKPP_SHA
+cp -r include/sockpp ../../third-party/include/
+cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B build
+cmake --build build -- -j${NUM_PROCS}
+cp build/libsockpp.so ../../third-party/runtime-libs/android/arm64-v8a/
 cd ..
diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
@@ -4,14 +4,14 @@ set -e
 
 LIBZEDMD_SHA=08e98a858eb6e1394b4844bec7dd27c7c0d9a845
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
-CPPSOCKETS_SHA=6ed9f98a46f073cc6aa7c8bcc610f9fdaedc4b13
+LIBLIBSOCKPP_SHA=4a0d8e087452b5c74179b268c0aceadef90906b9
 
 NUM_PROCS=$(sysctl -n hw.ncpu)
 
 echo "Building libraries..."
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  CPPSOCKETS_SHA: ${CPPSOCKETS_SHA}"
+echo "  LIBSOCKPP_SHA: ${LIBSOCKPP_SHA}"
 echo ""
 
 if [ -z "${BUILD_TYPE}" ]; then
@@ -33,11 +33,11 @@ cd external
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-cp src/ZeDMD.h ../../third-party/include
+cp src/ZeDMD.h ../../third-party/include/
 platforms/ios/arm64/external.sh
 cmake -DPLATFORM=ios -DARCH=arm64 -DBUILD_SHARED=OFF -DBUILD_STATIC=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B build
 cmake --build build -- -j${NUM_PROCS}
-cp build/libzedmd.a ../../third-party/build-libs/ios/arm64
+cp build/libzedmd.a ../../third-party/build-libs/ios/arm64/
 cp -r test ../../
 cd ..
 
@@ -48,18 +48,21 @@ cd ..
 curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip
 unzip libserum.zip
 cd libserum-$LIBSERUM_SHA
-cp src/serum-decode.h ../../third-party/include
+cp src/serum-decode.h ../../third-party/include/
 cmake -DPLATFORM=ios -DARCH=arm64 -DBUILD_SHARED=OFF -DBUILD_STATIC=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B build
 cmake --build build -- -j${NUM_PROCS}
-cp build/libserum.a ../../third-party/build-libs/ios/arm64
+cp build/libserum.a ../../third-party/build-libs/ios/arm64/
 cd ..
 
 #
-# build CppSockets and copy to external
+# build libsockpp and copy to external
 #
 
-curl -sL https://github.com/fredlllll/CppSockets/archive/${CPPSOCKETS_SHA}.zip -o CppSockets.zip
-unzip CppSockets.zip
-cd CppSockets-$CPPSOCKETS_SHA
-cp *.hpp ../../third-party/include/
+curl -sL https://github.com/fpagliughi/sockpp/archive/${LIBSOCKPP_SHA}.zip -o sockpp.zip
+unzip sockpp.zip
+cd sockpp-$LIBSOCKPP_SHA
+cp -r include/sockpp ../../third-party/include/
+cmake -DSOCKPP_BUILD_SHARED=OFF -DSOCKPP_BUILD_STATIC=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B build
+cmake --build build -- -j${NUM_PROCS}
+cp build/libsockpp.a ../../third-party/build-libs/ios/arm64/
 cd ..
diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
@@ -4,14 +4,14 @@ set -e
 
 LIBZEDMD_SHA=08e98a858eb6e1394b4844bec7dd27c7c0d9a845
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
-CPPSOCKETS_SHA=6ed9f98a46f073cc6aa7c8bcc610f9fdaedc4b13
+LIBLIBSOCKPP_SHA=4a0d8e087452b5c74179b268c0aceadef90906b9
 
 NUM_PROCS=$(nproc)
 
 echo "Building libraries..."
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  CPPSOCKETS_SHA: ${CPPSOCKETS_SHA}"
+echo "  LIBSOCKPP_SHA: ${LIBSOCKPP_SHA}"
 echo ""
 
 if [ -z "${BUILD_TYPE}" ]; then
@@ -33,13 +33,13 @@ cd external
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-cp src/ZeDMD.h ../../third-party/include
+cp src/ZeDMD.h ../../third-party/include/
 platforms/linux/aarch64/external.sh
 cmake -DPLATFORM=linux -DARCH=aarch64 -DBUILD_SHARED=ON -DBUILD_STATIC=OFF -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B build
 cmake --build build -- -j${NUM_PROCS}
-cp third-party/include/libserialport.h ../../third-party/include
-cp third-party/runtime-libs/linux/aarch64/libserialport.so.0 ../../third-party/runtime-libs/linux/aarch64
-cp build/libzedmd.so.0.6.0 ../../third-party/runtime-libs/linux/aarch64
+cp third-party/include/libserialport.h ../../third-party/include/
+cp third-party/runtime-libs/linux/aarch64/libserialport.so.0 ../../third-party/runtime-libs/linux/aarch64/
+cp build/libzedmd.so.0.6.0 ../../third-party/runtime-libs/linux/aarch64/
 cp -r test ../../
 cd ..
 
@@ -50,18 +50,21 @@ cd ..
 curl -sL https://github.com/zesinger/libserum/archive/${LIBSERUM_SHA}.zip -o libserum.zip
 unzip libserum.zip
 cd libserum-$LIBSERUM_SHA
-cp src/serum-decode.h ../../third-party/include
+cp src/serum-decode.h ../../third-party/include/
 cmake -DPLATFORM=linux -DARCH=aarch64 -DBUILD_SHARED=ON -DBUILD_STATIC=OFF -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B build
 cmake --build build -- -j${NUM_PROCS}
-cp build/libserum.so.1.6.2 ../../third-party/runtime-libs/linux/aarch64
+cp build/libserum.so.1.6.2 ../../third-party/runtime-libs/linux/aarch64/
 cd ..
 
 #
-# build CppSockets and copy to external
+# build libsockpp and copy to external
 #
 
-curl -sL https://github.com/fredlllll/CppSockets/archive/${CPPSOCKETS_SHA}.zip -o CppSockets.zip
-unzip CppSockets.zip
-cd CppSockets-$CPPSOCKETS_SHA
-cp *.hpp ../../third-party/include/
+curl -sL https://github.com/fpagliughi/sockpp/archive/${LIBSOCKPP_SHA}.zip -o sockpp.zip
+unzip sockpp.zip
+cd sockpp-$LIBSOCKPP_SHA
+cp -r include/sockpp ../../third-party/include/
+cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -B build
+cmake --build build -- -j${NUM_PROCS}
+cp build/libsockpp.so.1 ../../third-party/runtime-libs/runtime-libs/linux/aarch64/
 cd ..