Skip to content

Commit 64831a3

Browse files
mkalkbrennermkalkbrenner
authored
use libzedmd 0.9.0, use sockpp from libzedmd (#56)
1 parent 833aad2 commit 64831a3

File tree

18 files changed

+41
-263
lines changed

18 files changed

+41
-263
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ third-party/include/cargs.h
1313
third-party/include/*.hpp
1414
third-party/include/libserialport.h
1515
third-party/include/pupdmd.h
16+
third-party/include/serum.h
1617
third-party/include/serum-decode.h
1718
third-party/include/ZeDMD.h
1819
.DS_Store

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,6 @@ SaveSettings = 0
210210
Enabled = 0
211211
# Enter your ZeDMD WiFi IP address here
212212
WiFiAddr =
213-
# Set the ZeDMD WiFi Port number, you can leave this empty and it will default to 3333
214-
WiFiPort = 3333
215213
216214
[Pixelcade]
217215
# Set to 1 if Pixelcade is attached

‎dmdserver.ini‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ SaveSettings = 0
4040
Enabled = 0
4141
# Enter your ZeDMD WiFi IP address here
4242
WiFiAddr =
43-
# Set the ZeDMD WiFi Port number, you can leave this empty and it will default to 3333
44-
WiFiPort = 3333
4543

4644
[Pixelcade]
4745
# Set to 1 if Pixelcade is attached

‎include/DMDUtil/Config.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ class DMDUTILAPI Config
6666
void SetZeDMDWiFiEnabled(bool WiFiEnabled) { m_zedmdWiFiEnabled = WiFiEnabled; }
6767
const char* GetZeDMDWiFiAddr() const { return m_zedmdWiFiAddr.c_str(); }
6868
void SetZeDMDWiFiAddr(const char* ipaddr) { m_zedmdWiFiAddr = ipaddr; }
69-
int GetZeDMDWiFiPort() const { return m_zedmdWiFiPort; }
70-
void SetZeDMDWiFiPort(int port) { m_zedmdWiFiPort = port; }
7169
bool IsPixelcade() const { return m_pixelcade; }
7270
void SetPixelcade(bool pixelcade) { m_pixelcade = pixelcade; }
7371
void SetPixelcadeDevice(const char* port) { m_pixelcadeDevice = port; }
@@ -109,7 +107,6 @@ class DMDUTILAPI Config
109107
bool m_zedmdSaveSettings;
110108
bool m_zedmdWiFiEnabled;
111109
std::string m_zedmdWiFiAddr;
112-
int m_zedmdWiFiPort;
113110
bool m_dmdServer;
114111
std::string m_dmdServerAddr;
115112
int m_dmdServerPort;

‎platforms/android/arm64-v8a/external.sh‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
set -e
44

55
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
6+
LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
77
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
8-
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
98
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
109
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
1110

@@ -21,7 +20,6 @@ echo "Building libraries..."
2120
echo " CARGS_SHA: ${CARGS_SHA}"
2221
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
2322
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
24-
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
2523
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
2624
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
2725
echo " NUM_PROCS: ${NUM_PROCS}"
@@ -67,7 +65,7 @@ cd ..
6765
curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
6866
unzip libzedmd.zip
6967
cd libzedmd-$LIBZEDMD_SHA
70-
platforms/android/arm64-v8a/external.sh
68+
BUILD_TYPE=${BUILD_TYPE} platforms/android/arm64-v8a/external.sh
7169
cmake \
7270
-DPLATFORM=android \
7371
-DARCH=arm64-v8a \
@@ -77,6 +75,8 @@ cmake \
7775
-B build
7876
cmake --build build -- -j${NUM_PROCS}
7977
cp src/ZeDMD.h ../../third-party/include/
78+
cp -r third-party/include/sockpp ../../third-party/include/
79+
cp -a third-party/runtime-libs/android/arm64-v8a/*.so ../../third-party/runtime-libs/android/arm64-v8a/
8080
cp build/libzedmd.so ../../third-party/runtime-libs/android/arm64-v8a/
8181
cp -r test ../../
8282
cd ..
@@ -101,29 +101,6 @@ cp src/serum-decode.h ../../third-party/include/
101101
cp build/libserum.so ../../third-party/runtime-libs/android/arm64-v8a/
102102
cd ..
103103

104-
#
105-
# build sockpp and copy to external
106-
#
107-
108-
curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
109-
unzip sockpp.zip
110-
cd sockpp-$SOCKPP_SHA
111-
patch -p1 < ../../platforms/android/arm64-v8a/sockpp/001.patch
112-
cmake \
113-
-DSOCKPP_BUILD_SHARED=ON \
114-
-DSOCKPP_BUILD_STATIC=OFF \
115-
-DCMAKE_SYSTEM_NAME=Android \
116-
-DCMAKE_SYSTEM_VERSION=30 \
117-
-DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \
118-
-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
119-
-DCMAKE_INSTALL_RPATH="\$ORIGIN" \
120-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
121-
-B build
122-
cmake --build build -- -j${NUM_PROCS}
123-
cp -r include/sockpp ../../third-party/include/
124-
cp build/libsockpp.so ../../third-party/runtime-libs/android/arm64-v8a/
125-
cd ..
126-
127104
#
128105
# build libpupdmd and copy to external
129106
#

‎platforms/android/arm64-v8a/sockpp/001.patch‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎platforms/ios-simulator/arm64/external.sh‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
set -e
44

55
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
6+
LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
77
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
8-
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
98
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
109
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
1110

@@ -15,7 +14,6 @@ echo "Building libraries..."
1514
echo " CARGS_SHA: ${CARGS_SHA}"
1615
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1716
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
18-
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
1917
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
2018
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
2119
echo ""
@@ -58,7 +56,7 @@ cd ..
5856
curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
5957
unzip libzedmd.zip
6058
cd libzedmd-$LIBZEDMD_SHA
61-
platforms/ios-simulator/arm64/external.sh
59+
BUILD_TYPE=${BUILD_TYPE} platforms/ios-simulator/arm64/external.sh
6260
cmake \
6361
-DPLATFORM=ios-simulator \
6462
-DARCH=arm64 \
@@ -68,6 +66,8 @@ cmake \
6866
-B build
6967
cmake --build build -- -j${NUM_PROCS}
7068
cp src/ZeDMD.h ../../third-party/include/
69+
cp -r third-party/include/sockpp ../../third-party/include/
70+
cp -a third-party/build-libs/ios-simulator/arm64/*.a ../../third-party/build-libs/ios-simulator/arm64/
7171
cp build/libzedmd.a ../../third-party/build-libs/ios-simulator/arm64/
7272
cp -r test ../../
7373
cd ..
@@ -92,27 +92,6 @@ cp src/serum-decode.h ../../third-party/include/
9292
cp build/libserum.a ../../third-party/build-libs/ios-simulator/arm64/
9393
cd ..
9494

95-
#
96-
# build sockpp and copy to external
97-
#
98-
99-
curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
100-
unzip sockpp.zip
101-
cd sockpp-$SOCKPP_SHA
102-
cmake \
103-
-DSOCKPP_BUILD_SHARED=OFF \
104-
-DSOCKPP_BUILD_STATIC=ON \
105-
-DCMAKE_SYSTEM_NAME=iOS \
106-
-DCMAKE_OSX_SYSROOT=iphonesimulator \
107-
-DCMAKE_OSX_ARCHITECTURES=arm64 \
108-
-DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \
109-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
110-
-B build
111-
cmake --build build -- -j${NUM_PROCS}
112-
cp -r include/sockpp ../../third-party/include/
113-
cp build/libsockpp.a ../../third-party/build-libs/ios-simulator/arm64/
114-
cd ..
115-
11695
#
11796
# build libpupdmd and copy to external
11897
#

‎platforms/ios/arm64/external.sh‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
set -e
44

55
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
6+
LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
77
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
8-
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
98
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
109
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
1110

@@ -15,7 +14,6 @@ echo "Building libraries..."
1514
echo " CARGS_SHA: ${CARGS_SHA}"
1615
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1716
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
18-
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
1917
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
2018
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
2119
echo ""
@@ -57,7 +55,7 @@ cd ..
5755
curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
5856
unzip libzedmd.zip
5957
cd libzedmd-$LIBZEDMD_SHA
60-
platforms/ios/arm64/external.sh
58+
BUILD_TYPE=${BUILD_TYPE} platforms/ios/arm64/external.sh
6159
cmake \
6260
-DPLATFORM=ios \
6361
-DARCH=arm64 \
@@ -67,6 +65,8 @@ cmake \
6765
-B build
6866
cmake --build build -- -j${NUM_PROCS}
6967
cp src/ZeDMD.h ../../third-party/include/
68+
cp -r third-party/include/sockpp ../../third-party/include/
69+
cp -a third-party/build-libs/ios/arm64/*.a ../../third-party/build-libs/ios/arm64/
7070
cp build/libzedmd.a ../../third-party/build-libs/ios/arm64/
7171
cp -r test ../../
7272
cd ..
@@ -91,26 +91,6 @@ cp src/serum-decode.h ../../third-party/include/
9191
cp build/libserum.a ../../third-party/build-libs/ios/arm64/
9292
cd ..
9393

94-
#
95-
# build sockpp and copy to external
96-
#
97-
98-
curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
99-
unzip sockpp.zip
100-
cd sockpp-$SOCKPP_SHA
101-
cmake \
102-
-DSOCKPP_BUILD_SHARED=OFF \
103-
-DSOCKPP_BUILD_STATIC=ON \
104-
-DCMAKE_SYSTEM_NAME=iOS \
105-
-DCMAKE_OSX_ARCHITECTURES=arm64 \
106-
-DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \
107-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
108-
-B build
109-
cmake --build build -- -j${NUM_PROCS}
110-
cp -r include/sockpp ../../third-party/include/
111-
cp build/libsockpp.a ../../third-party/build-libs/ios/arm64/
112-
cd ..
113-
11494
#
11595
# build libpupdmd and copy to external
11696
#

‎platforms/linux/aarch64/external.sh‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
set -e
44

55
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
6+
LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
77
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
8-
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
98
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
109
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
1110

@@ -15,7 +14,6 @@ echo "Building libraries..."
1514
echo " CARGS_SHA: ${CARGS_SHA}"
1615
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1716
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
18-
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
1917
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
2018
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
2119
echo ""
@@ -55,7 +53,7 @@ cd ..
5553
curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
5654
unzip libzedmd.zip
5755
cd libzedmd-$LIBZEDMD_SHA
58-
platforms/linux/aarch64/external.sh
56+
BUILD_TYPE=${BUILD_TYPE} platforms/linux/aarch64/external.sh
5957
cmake \
6058
-DPLATFORM=linux \
6159
-DARCH=aarch64 \
@@ -66,6 +64,7 @@ cmake \
6664
cmake --build build -- -j${NUM_PROCS}
6765
cp src/ZeDMD.h ../../third-party/include/
6866
cp third-party/include/libserialport.h ../../third-party/include/
67+
cp -r third-party/include/sockpp ../../third-party/include/
6968
cp -a third-party/runtime-libs/linux/aarch64/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
7069
cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
7170
cp -r test ../../
@@ -92,21 +91,6 @@ cp src/serum-decode.h ../../third-party/include/
9291
cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
9392
cd ..
9493

95-
#
96-
# build sockpp and copy to external
97-
#
98-
99-
curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
100-
unzip sockpp.zip
101-
cd sockpp-$SOCKPP_SHA
102-
cmake \
103-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
104-
-B build
105-
cmake --build build -- -j${NUM_PROCS}
106-
cp -r include/sockpp ../../third-party/include/
107-
cp -a build/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
108-
cd ..
109-
11094
#
11195
# build libpupdmd and copy to external
11296
#

‎platforms/linux/x64/external.sh‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
set -e
44

55
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=a77d27877ed4504cc329592606e1976171562329
6+
LIBZEDMD_SHA=642a3be95ad4caa6d74ff0e219be5da34632ce10
77
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
8-
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
98
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
109
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
1110

@@ -15,7 +14,6 @@ echo "Building libraries..."
1514
echo " CARGS_SHA: ${CARGS_SHA}"
1615
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1716
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
18-
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
1917
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
2018
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
2119
echo ""
@@ -55,7 +53,7 @@ cd ..
5553
curl -sL https://github.com/PPUC/libzedmd/archive/${LIBZEDMD_SHA}.zip -o libzedmd.zip
5654
unzip libzedmd.zip
5755
cd libzedmd-$LIBZEDMD_SHA
58-
platforms/linux/x64/external.sh
56+
BUILD_TYPE=${BUILD_TYPE} platforms/linux/x64/external.sh
5957
cmake \
6058
-DPLATFORM=linux \
6159
-DARCH=x64 \
@@ -66,6 +64,7 @@ cmake \
6664
cmake --build build -- -j${NUM_PROCS}
6765
cp src/ZeDMD.h ../../third-party/include/
6866
cp third-party/include/libserialport.h ../../third-party/include/
67+
cp -r third-party/include/sockpp ../../third-party/include/
6968
cp -a third-party/runtime-libs/linux/x64/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
7069
cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
7170
cp -r test ../../
@@ -91,21 +90,6 @@ cp src/serum-decode.h ../../third-party/include/
9190
cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/x64/
9291
cd ..
9392

94-
#
95-
# build sockpp and copy to external
96-
#
97-
98-
curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
99-
unzip sockpp.zip
100-
cd sockpp-$SOCKPP_SHA
101-
cmake \
102-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
103-
-B build
104-
cmake --build build -- -j${NUM_PROCS}
105-
cp -r include/sockpp ../../third-party/include/
106-
cp -a build/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/x64/
107-
cd ..
108-
10993
#
11094
# build libpupdmd and copy to external
11195
#

0 commit comments

Comments
 (0)