use libzedmd 0.9.0, use sockpp from libzedmd

PPUC · Jan 19, 2025 · 9824a69 · 9824a69
1 parent 833aad2
commit 9824a69
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 242 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ third-party/include/cargs.h
 third-party/include/*.hpp
 third-party/include/libserialport.h
 third-party/include/pupdmd.h
+third-party/include/serum.h
 third-party/include/serum-decode.h
 third-party/include/ZeDMD.h
 .DS_Store
diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=a2f7ce9598b30ee9e0637ac9371da6339db9705b
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -21,7 +20,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo "  NUM_PROCS: ${NUM_PROCS}"
@@ -101,29 +99,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp build/libserum.so ../../third-party/runtime-libs/android/arm64-v8a/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-patch -p1 < ../../platforms/android/arm64-v8a/sockpp/001.patch
-cmake \
-   -DSOCKPP_BUILD_SHARED=ON \
-   -DSOCKPP_BUILD_STATIC=OFF \
-   -DCMAKE_SYSTEM_NAME=Android \
-   -DCMAKE_SYSTEM_VERSION=30 \
-   -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \
-   -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
-   -DCMAKE_INSTALL_RPATH="\$ORIGIN" \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp build/libsockpp.so ../../third-party/runtime-libs/android/arm64-v8a/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #

diff --git a/platforms/android/arm64-v8a/sockpp/001.patch b/platforms/android/arm64-v8a/sockpp/001.patch
diff --git a/platforms/ios-simulator/arm64/external.sh b/platforms/ios-simulator/arm64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=a2f7ce9598b30ee9e0637ac9371da6339db9705b
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -92,27 +90,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp build/libserum.a ../../third-party/build-libs/ios-simulator/arm64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=OFF \
-   -DSOCKPP_BUILD_STATIC=ON \
-   -DCMAKE_SYSTEM_NAME=iOS \
-   -DCMAKE_OSX_SYSROOT=iphonesimulator \
-   -DCMAKE_OSX_ARCHITECTURES=arm64 \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp build/libsockpp.a ../../third-party/build-libs/ios-simulator/arm64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #

diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=a2f7ce9598b30ee9e0637ac9371da6339db9705b
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -91,26 +89,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp build/libserum.a ../../third-party/build-libs/ios/arm64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=OFF \
-   -DSOCKPP_BUILD_STATIC=ON \
-   -DCMAKE_SYSTEM_NAME=iOS \
-   -DCMAKE_OSX_ARCHITECTURES=arm64 \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp build/libsockpp.a ../../third-party/build-libs/ios/arm64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #

diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=a2f7ce9598b30ee9e0637ac9371da6339db9705b
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -92,21 +90,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp -a build/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #

diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=a2f7ce9598b30ee9e0637ac9371da6339db9705b
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -91,21 +89,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/x64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp -a build/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/x64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #

diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=a2f7ce9598b30ee9e0637ac9371da6339db9705b
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -94,25 +92,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=ON \
-   -DSOCKPP_BUILD_STATIC=OFF \
-   -DCMAKE_OSX_ARCHITECTURES=arm64 \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #

diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=a2f7ce9598b30ee9e0637ac9371da6339db9705b
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -94,25 +92,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=ON \
-   -DSOCKPP_BUILD_STATIC=OFF \
-   -DCMAKE_OSX_ARCHITECTURES=x86_64 \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #

diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh
@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=a2f7ce9598b30ee9e0637ac9371da6339db9705b
 LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
-SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
 
@@ -15,7 +14,6 @@ echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"
 echo "  LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
 echo "  LIBSERUM_SHA: ${LIBSERUM_SHA}"
-echo "  SOCKPP_SHA: ${SOCKPP_SHA}"
 echo "  LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
 echo "  LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
 echo ""
@@ -89,26 +87,6 @@ cp src/serum-decode.h ../../third-party/include/
 cp build/libserum.a ../../third-party/build-libs/tvos/arm64/
 cd ..
 
-#
-# build sockpp and copy to external
-#
-
-curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
-unzip sockpp.zip
-cd sockpp-$SOCKPP_SHA
-cmake \
-   -DSOCKPP_BUILD_SHARED=OFF \
-   -DSOCKPP_BUILD_STATIC=ON \
-   -DCMAKE_SYSTEM_NAME=tvOS \
-   -DCMAKE_OSX_DEPLOYMENT_TARGET=16.0 \
-   -DCMAKE_OSX_ARCHITECTURES=arm64 \
-   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-   -B build
-cmake --build build -- -j${NUM_PROCS}
-cp -r include/sockpp ../../third-party/include/
-cp build/libsockpp.a ../../third-party/build-libs/tvos/arm64/
-cd ..
-
 #
 # build libpupdmd and copy to external
 #