use libzedmd 0.9.0, use sockpp from libzedmd

.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

README.md

@@ -210,8 +210,6 @@ SaveSettings = 0
 Enabled = 0
 # Enter your ZeDMD WiFi IP address here
 WiFiAddr = 
-# Set the ZeDMD WiFi Port number, you can leave this empty and it will default to 3333
-WiFiPort = 3333
 
 [Pixelcade]
 # Set to 1 if Pixelcade is attached

dmdserver.ini

@@ -40,8 +40,6 @@ SaveSettings = 0
 Enabled = 0
 # Enter your ZeDMD WiFi IP address here
 WiFiAddr = 
-# Set the ZeDMD WiFi Port number, you can leave this empty and it will default to 3333
-WiFiPort = 3333
 
 [Pixelcade]
 # Set to 1 if Pixelcade is attached

include/DMDUtil/Config.h

@@ -66,8 +66,6 @@ class DMDUTILAPI Config
   void SetZeDMDWiFiEnabled(bool WiFiEnabled) { m_zedmdWiFiEnabled = WiFiEnabled; }
   const char* GetZeDMDWiFiAddr() const { return m_zedmdWiFiAddr.c_str(); }
   void SetZeDMDWiFiAddr(const char* ipaddr) { m_zedmdWiFiAddr = ipaddr; }
-  int GetZeDMDWiFiPort() const { return m_zedmdWiFiPort; }
-  void SetZeDMDWiFiPort(int port) { m_zedmdWiFiPort = port; }
   bool IsPixelcade() const { return m_pixelcade; }
   void SetPixelcade(bool pixelcade) { m_pixelcade = pixelcade; }
   void SetPixelcadeDevice(const char* port) { m_pixelcadeDevice = port; }
@@ -109,7 +107,6 @@ class DMDUTILAPI Config
   bool m_zedmdSaveSettings;
   bool m_zedmdWiFiEnabled;
   std::string m_zedmdWiFiAddr;
-  int m_zedmdWiFiPort;
   bool m_dmdServer;
   std::string m_dmdServerAddr;
   int m_dmdServerPort;

platforms/android/arm64-v8a/external.sh

@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 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}"
@@ -67,7 +65,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/android/arm64-v8a/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/android/arm64-v8a/external.sh
 cmake \
    -DPLATFORM=android \
    -DARCH=arm64-v8a \
@@ -77,6 +75,8 @@ cmake \
    -B build
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
+cp -a third-party/runtime-libs/android/arm64-v8a/*.so ../../third-party/runtime-libs/android/arm64-v8a/
 cp build/libzedmd.so ../../third-party/runtime-libs/android/arm64-v8a/
 cp -r test ../../
 cd ..
@@ -101,29 +101,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
 #

platforms/ios-simulator/arm64/external.sh

@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 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 ""
@@ -58,7 +56,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/ios-simulator/arm64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/ios-simulator/arm64/external.sh
 cmake \
    -DPLATFORM=ios-simulator \
    -DARCH=arm64 \
@@ -68,6 +66,8 @@ cmake \
    -B build
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
+cp -a third-party/build-libs/ios-simulator/arm64/*.a ../../third-party/build-libs/ios-simulator/arm64/
 cp build/libzedmd.a ../../third-party/build-libs/ios-simulator/arm64/
 cp -r test ../../
 cd ..
@@ -92,27 +92,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
 #

platforms/ios/arm64/external.sh

@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 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 ""
@@ -57,7 +55,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/ios/arm64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/ios/arm64/external.sh
 cmake \
    -DPLATFORM=ios \
    -DARCH=arm64 \
@@ -67,6 +65,8 @@ cmake \
    -B build
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
+cp -a third-party/build-libs/ios/arm64/*.a ../../third-party/build-libs/ios/arm64/
 cp build/libzedmd.a ../../third-party/build-libs/ios/arm64/
 cp -r test ../../
 cd ..
@@ -91,26 +91,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
 #

platforms/linux/aarch64/external.sh

@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 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 ""
@@ -55,7 +53,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/linux/aarch64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/linux/aarch64/external.sh
 cmake \
    -DPLATFORM=linux \
    -DARCH=aarch64 \
@@ -66,6 +64,7 @@ cmake \
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
 cp -a third-party/runtime-libs/linux/aarch64/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
 cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
 cp -r test ../../
@@ -92,21 +91,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
 #

platforms/linux/x64/external.sh

@@ -3,9 +3,8 @@
 set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
-LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
+LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
 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 ""
@@ -55,7 +53,7 @@ cd ..
 curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
 unzip libzedmd.zip
 cd libzedmd-$LIBZEDMD_SHA
-platforms/linux/x64/external.sh
+BUILD_TYPE=${BUILD_TYPE} platforms/linux/x64/external.sh
 cmake \
    -DPLATFORM=linux \
    -DARCH=x64 \
@@ -66,6 +64,7 @@ cmake \
 cmake --build build -- -j${NUM_PROCS}
 cp src/ZeDMD.h ../../third-party/include/
 cp third-party/include/libserialport.h ../../third-party/include/
+cp -r third-party/include/sockpp ../../third-party/include/
 cp -a third-party/runtime-libs/linux/x64/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
 cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
 cp -r test ../../
@@ -91,21 +90,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
 #