Skip to content

Commit 9824a69

Browse files
mkalkbrennermkalkbrenner
committed
use libzedmd 0.9.0, use sockpp from libzedmd
1 parent 833aad2 commit 9824a69

File tree

13 files changed

+11
-242
lines changed

13 files changed

+11
-242
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

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

Lines changed: 1 addition & 26 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=a2f7ce9598b30ee9e0637ac9371da6339db9705b
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}"
@@ -101,29 +99,6 @@ cp src/serum-decode.h ../../third-party/include/
10199
cp build/libserum.so ../../third-party/runtime-libs/android/arm64-v8a/
102100
cd ..
103101

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-
127102
#
128103
# build libpupdmd and copy to external
129104
#

‎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: 1 addition & 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=a2f7ce9598b30ee9e0637ac9371da6339db9705b
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 ""
@@ -92,27 +90,6 @@ cp src/serum-decode.h ../../third-party/include/
9290
cp build/libserum.a ../../third-party/build-libs/ios-simulator/arm64/
9391
cd ..
9492

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-
11693
#
11794
# build libpupdmd and copy to external
11895
#

‎platforms/ios/arm64/external.sh‎

Lines changed: 1 addition & 23 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=a2f7ce9598b30ee9e0637ac9371da6339db9705b
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 ""
@@ -91,26 +89,6 @@ cp src/serum-decode.h ../../third-party/include/
9189
cp build/libserum.a ../../third-party/build-libs/ios/arm64/
9290
cd ..
9391

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-
11492
#
11593
# build libpupdmd and copy to external
11694
#

‎platforms/linux/aarch64/external.sh‎

Lines changed: 1 addition & 18 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=a2f7ce9598b30ee9e0637ac9371da6339db9705b
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 ""
@@ -92,21 +90,6 @@ cp src/serum-decode.h ../../third-party/include/
9290
cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
9391
cd ..
9492

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-
11093
#
11194
# build libpupdmd and copy to external
11295
#

‎platforms/linux/x64/external.sh‎

Lines changed: 1 addition & 18 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=a2f7ce9598b30ee9e0637ac9371da6339db9705b
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 ""
@@ -91,21 +89,6 @@ cp src/serum-decode.h ../../third-party/include/
9189
cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/x64/
9290
cd ..
9391

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-
10992
#
11093
# build libpupdmd and copy to external
11194
#

‎platforms/macos/arm64/external.sh‎

Lines changed: 1 addition & 22 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=a2f7ce9598b30ee9e0637ac9371da6339db9705b
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 ""
@@ -94,25 +92,6 @@ cp src/serum-decode.h ../../third-party/include/
9492
cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
9593
cd ..
9694

97-
#
98-
# build sockpp and copy to external
99-
#
100-
101-
curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
102-
unzip sockpp.zip
103-
cd sockpp-$SOCKPP_SHA
104-
cmake \
105-
-DSOCKPP_BUILD_SHARED=ON \
106-
-DSOCKPP_BUILD_STATIC=OFF \
107-
-DCMAKE_OSX_ARCHITECTURES=arm64 \
108-
-DCMAKE_OSX_DEPLOYMENT_TARGET=14.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 -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
114-
cd ..
115-
11695
#
11796
# build libpupdmd and copy to external
11897
#

‎platforms/macos/x64/external.sh‎

Lines changed: 1 addition & 22 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=a2f7ce9598b30ee9e0637ac9371da6339db9705b
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 ""
@@ -94,25 +92,6 @@ cp src/serum-decode.h ../../third-party/include/
9492
cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
9593
cd ..
9694

97-
#
98-
# build sockpp and copy to external
99-
#
100-
101-
curl -sL https://github.com/fpagliughi/sockpp/archive/${SOCKPP_SHA}.zip -o sockpp.zip
102-
unzip sockpp.zip
103-
cd sockpp-$SOCKPP_SHA
104-
cmake \
105-
-DSOCKPP_BUILD_SHARED=ON \
106-
-DSOCKPP_BUILD_STATIC=OFF \
107-
-DCMAKE_OSX_ARCHITECTURES=x86_64 \
108-
-DCMAKE_OSX_DEPLOYMENT_TARGET=14.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 -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
114-
cd ..
115-
11695
#
11796
# build libpupdmd and copy to external
11897
#

‎platforms/tvos/arm64/external.sh‎

Lines changed: 1 addition & 23 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=a2f7ce9598b30ee9e0637ac9371da6339db9705b
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 ""
@@ -89,26 +87,6 @@ cp src/serum-decode.h ../../third-party/include/
8987
cp build/libserum.a ../../third-party/build-libs/tvos/arm64/
9088
cd ..
9189

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

0 commit comments

Comments
 (0)