Skip to content

Commit 5afd52c

Browse files
mkalkbrennermkalkbrenner
authored
libzedmd 0.9.1 (#57)
* libzedmd 0.9.1, re-use cargs anf FrameUtil from libzedmd, removed RGBOrder and SaveSettings * no cargs on mobile devices
1 parent bd27866 commit 5afd52c

File tree

16 files changed

+32
-389
lines changed

16 files changed

+32
-389
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ if(BUILD_SHARED)
117117
target_link_directories(dmdutil_shared PUBLIC
118118
third-party/build-libs/${PLATFORM}/${ARCH}
119119
)
120-
target_link_libraries(dmdutil_shared PUBLIC cargs zedmd serum sockpp pupdmd)
120+
target_link_libraries(dmdutil_shared PUBLIC zedmd serum sockpp pupdmd)
121121
elseif(PLATFORM STREQUAL "android")
122122
target_link_directories(dmdutil_shared PUBLIC
123123
third-party/runtime-libs/${PLATFORM}/${ARCH}
124124
)
125-
target_link_libraries(dmdutil_shared PUBLIC cargs zedmd serum sockpp pupdmd)
125+
target_link_libraries(dmdutil_shared PUBLIC zedmd serum sockpp pupdmd)
126126
endif()
127127

128128
if(PLATFORM STREQUAL "win" AND ARCH STREQUAL "x64")

‎include/DMDUtil/Config.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,8 @@ class DMDUTILAPI Config
5656
void SetZeDMDDevice(const char* port) { m_zedmdDevice = port; }
5757
bool IsZeDMDDebug() const { return m_zedmdDebug; }
5858
void SetZeDMDDebug(bool debug) { m_zedmdDebug = debug; }
59-
int GetZeDMDRGBOrder() const { return m_zedmdRgbOrder; }
60-
void SetZeDMDRGBOrder(int rgbOrder) { m_zedmdRgbOrder = rgbOrder; }
6159
int GetZeDMDBrightness() const { return m_zedmdBrightness; }
6260
void SetZeDMDBrightness(int brightness) { m_zedmdBrightness = brightness; }
63-
bool IsZeDMDSaveSettings() const { return m_zedmdSaveSettings; }
64-
void SetZeDMDSaveSettings(bool saveSettings) { m_zedmdSaveSettings = saveSettings; }
6561
bool IsZeDMDWiFiEnabled() const { return m_zedmdWiFiEnabled; }
6662
void SetZeDMDWiFiEnabled(bool WiFiEnabled) { m_zedmdWiFiEnabled = WiFiEnabled; }
6763
const char* GetZeDMDWiFiAddr() const { return m_zedmdWiFiAddr.c_str(); }
@@ -102,9 +98,7 @@ class DMDUTILAPI Config
10298
bool m_zedmd;
10399
std::string m_zedmdDevice;
104100
bool m_zedmdDebug;
105-
int m_zedmdRgbOrder;
106101
int m_zedmdBrightness;
107-
bool m_zedmdSaveSettings;
108102
bool m_zedmdWiFiEnabled;
109103
std::string m_zedmdWiFiAddr;
110104
bool m_dmdServer;

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

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
set -e
44

5-
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b
5+
LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe
76
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
87
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
9-
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
108

119
if [[ $(uname) == "Linux" ]]; then
1210
NUM_PROCS=$(nproc)
@@ -17,11 +15,9 @@ else
1715
fi
1816

1917
echo "Building libraries..."
20-
echo " CARGS_SHA: ${CARGS_SHA}"
2118
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
2219
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
2320
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
24-
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
2521
echo " NUM_PROCS: ${NUM_PROCS}"
2622
echo ""
2723

@@ -37,27 +33,6 @@ rm -rf external
3733
mkdir external
3834
cd external
3935

40-
#
41-
# build cargs and copy to external
42-
#
43-
44-
curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip
45-
unzip cargs.zip
46-
cd cargs-${CARGS_SHA}
47-
cmake \
48-
-DBUILD_SHARED_LIBS=ON \
49-
-DCMAKE_SYSTEM_NAME=Android \
50-
-DCMAKE_SYSTEM_VERSION=30 \
51-
-DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \
52-
-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
53-
-DCMAKE_INSTALL_RPATH="\$ORIGIN" \
54-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
55-
-B build
56-
cmake --build build -- -j${NUM_PROCS}
57-
cp include/cargs.h ../../third-party/include/
58-
cp build/*.so ../../third-party/runtime-libs/android/arm64-v8a/
59-
cd ..
60-
6136
#
6237
# build libzedmd and copy to external
6338
#
@@ -76,6 +51,7 @@ cmake \
7651
cmake --build build -- -j${NUM_PROCS}
7752
cp src/ZeDMD.h ../../third-party/include/
7853
cp -r third-party/include/sockpp ../../third-party/include/
54+
cp third-party/include/FrameUtil.h ../../third-party/include/
7955
cp -a third-party/runtime-libs/android/arm64-v8a/*.so ../../third-party/runtime-libs/android/arm64-v8a/
8056
cp build/libzedmd.so ../../third-party/runtime-libs/android/arm64-v8a/
8157
cp -r test ../../
@@ -118,13 +94,3 @@ cmake --build build -- -j${NUM_PROCS}
11894
cp src/pupdmd.h ../../third-party/include/
11995
cp build/libpupdmd.so ../../third-party/runtime-libs/android/arm64-v8a/
12096
cd ..
121-
122-
#
123-
# copy libframeutil
124-
#
125-
126-
curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
127-
unzip libframeutil.zip
128-
cd libframeutil-$LIBFRAMEUTIL_SHA
129-
cp include/* ../../third-party/include
130-
cd ..

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

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

55
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b
6+
LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe
77
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
88
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
99
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
1010

1111
NUM_PROCS=$(sysctl -n hw.ncpu)
1212

1313
echo "Building libraries..."
14-
echo " CARGS_SHA: ${CARGS_SHA}"
1514
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1615
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
1716
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
18-
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
1917
echo ""
2018

2119
if [ -z "${BUILD_TYPE}" ]; then
@@ -30,25 +28,6 @@ rm -rf external
3028
mkdir external
3129
cd external
3230

33-
#
34-
# build cargs and copy to external
35-
#
36-
37-
curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip
38-
unzip cargs.zip
39-
cd cargs-${CARGS_SHA}
40-
cmake \
41-
-DCMAKE_SYSTEM_NAME=iOS \
42-
-DCMAKE_OSX_SYSROOT=iphonesimulator \
43-
-DCMAKE_OSX_ARCHITECTURES=arm64 \
44-
-DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \
45-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
46-
-B build
47-
cmake --build build -- -j${NUM_PROCS}
48-
cp include/cargs.h ../../third-party/include/
49-
cp build/*.a ../../third-party/build-libs/ios-simulator/arm64/
50-
cd ..
51-
5231
#
5332
# build libzedmd and copy to external
5433
#
@@ -67,6 +46,7 @@ cmake \
6746
cmake --build build -- -j${NUM_PROCS}
6847
cp src/ZeDMD.h ../../third-party/include/
6948
cp -r third-party/include/sockpp ../../third-party/include/
49+
cp third-party/include/FrameUtil.h ../../third-party/include/
7050
cp -a third-party/build-libs/ios-simulator/arm64/*.a ../../third-party/build-libs/ios-simulator/arm64/
7151
cp build/libzedmd.a ../../third-party/build-libs/ios-simulator/arm64/
7252
cp -r test ../../
@@ -110,13 +90,3 @@ cmake --build build -- -j${NUM_PROCS}
11090
cp src/pupdmd.h ../../third-party/include/
11191
cp build/libpupdmd.a ../../third-party/build-libs/ios-simulator/arm64/
11292
cd ..
113-
114-
#
115-
# copy libframeutil
116-
#
117-
118-
curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
119-
unzip libframeutil.zip
120-
cd libframeutil-$LIBFRAMEUTIL_SHA
121-
cp include/* ../../third-party/include
122-
cd ..

‎platforms/ios/arm64/external.sh‎

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22

33
set -e
44

5-
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b
5+
LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe
76
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
87
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
9-
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
108

119
NUM_PROCS=$(sysctl -n hw.ncpu)
1210

1311
echo "Building libraries..."
14-
echo " CARGS_SHA: ${CARGS_SHA}"
1512
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1613
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
1714
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
18-
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
1915
echo ""
2016

2117
if [ -z "${BUILD_TYPE}" ]; then
@@ -30,24 +26,6 @@ rm -rf external
3026
mkdir external
3127
cd external
3228

33-
#
34-
# build cargs and copy to external
35-
#
36-
37-
curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip
38-
unzip cargs.zip
39-
cd cargs-${CARGS_SHA}
40-
cmake \
41-
-DCMAKE_SYSTEM_NAME=iOS \
42-
-DCMAKE_OSX_ARCHITECTURES=arm64 \
43-
-DCMAKE_OSX_DEPLOYMENT_TARGET=17.0 \
44-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
45-
-B build
46-
cmake --build build -- -j${NUM_PROCS}
47-
cp include/cargs.h ../../third-party/include/
48-
cp build/*.a ../../third-party/build-libs/ios/arm64/
49-
cd ..
50-
5129
#
5230
# build libzedmd and copy to external
5331
#
@@ -66,6 +44,7 @@ cmake \
6644
cmake --build build -- -j${NUM_PROCS}
6745
cp src/ZeDMD.h ../../third-party/include/
6846
cp -r third-party/include/sockpp ../../third-party/include/
47+
cp third-party/include/FrameUtil.h ../../third-party/include/
6948
cp -a third-party/build-libs/ios/arm64/*.a ../../third-party/build-libs/ios/arm64/
7049
cp build/libzedmd.a ../../third-party/build-libs/ios/arm64/
7150
cp -r test ../../
@@ -109,13 +88,3 @@ cmake --build build -- -j${NUM_PROCS}
10988
cp src/pupdmd.h ../../third-party/include/
11089
cp build/libpupdmd.a ../../third-party/build-libs/ios/arm64/
11190
cd ..
112-
113-
#
114-
# copy libframeutil
115-
#
116-
117-
curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
118-
unzip libframeutil.zip
119-
cd libframeutil-$LIBFRAMEUTIL_SHA
120-
cp include/* ../../third-party/include
121-
cd ..

‎platforms/linux/aarch64/external.sh‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22

33
set -e
44

5-
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b
5+
LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe
76
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
87
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
9-
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
108

119
NUM_PROCS=$(nproc)
1210

1311
echo "Building libraries..."
14-
echo " CARGS_SHA: ${CARGS_SHA}"
1512
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1613
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
1714
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
18-
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
1915
echo ""
2016

2117
if [ -z "${BUILD_TYPE}" ]; then
@@ -30,22 +26,6 @@ rm -rf external
3026
mkdir external
3127
cd external
3228

33-
#
34-
# build cargs and copy to external
35-
#
36-
37-
curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip
38-
unzip cargs.zip
39-
cd cargs-${CARGS_SHA}
40-
cmake \
41-
-DBUILD_SHARED_LIBS=ON \
42-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
43-
-B build
44-
cmake --build build -- -j${NUM_PROCS}
45-
cp include/cargs.h ../../third-party/include/
46-
cp -a build/*.so ../../third-party/runtime-libs/linux/aarch64/
47-
cd ..
48-
4929
#
5030
# build libzedmd and copy to external
5131
#
@@ -64,7 +44,9 @@ cmake \
6444
cmake --build build -- -j${NUM_PROCS}
6545
cp src/ZeDMD.h ../../third-party/include/
6646
cp third-party/include/libserialport.h ../../third-party/include/
47+
cp third-party/include/cargs.h ../../third-party/include/
6748
cp -r third-party/include/sockpp ../../third-party/include/
49+
cp third-party/include/FrameUtil.h ../../third-party/include/
6850
cp -a third-party/runtime-libs/linux/aarch64/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
6951
cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
7052
cp -r test ../../
@@ -109,13 +91,3 @@ cmake --build build -- -j${NUM_PROCS}
10991
cp src/pupdmd.h ../../third-party/include/
11092
cp -a build/libpupdmd.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
11193
cd ..
112-
113-
#
114-
# copy libframeutil
115-
#
116-
117-
curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
118-
unzip libframeutil.zip
119-
cd libframeutil-$LIBFRAMEUTIL_SHA
120-
cp include/* ../../third-party/include
121-
cd ..

‎platforms/linux/x64/external.sh‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22

33
set -e
44

5-
CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
6-
LIBZEDMD_SHA=d9ef6f7833ee9c6917c5cd85a917b935e15bbc8b
5+
LIBZEDMD_SHA=794508521a83c1e90e31b9f24b11b574b42c93fe
76
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
87
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
9-
LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182
108

119
NUM_PROCS=$(nproc)
1210

1311
echo "Building libraries..."
14-
echo " CARGS_SHA: ${CARGS_SHA}"
1512
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1613
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
1714
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
18-
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
1915
echo ""
2016

2117
if [ -z "${BUILD_TYPE}" ]; then
@@ -30,22 +26,6 @@ rm -rf external
3026
mkdir external
3127
cd external
3228

33-
#
34-
# build cargs and copy to external
35-
#
36-
37-
curl -sL https://github.com/likle/cargs/archive/${CARGS_SHA}.zip -o cargs.zip
38-
unzip cargs.zip
39-
cd cargs-${CARGS_SHA}
40-
cmake \
41-
-DBUILD_SHARED_LIBS=ON \
42-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
43-
-B build
44-
cmake --build build -- -j${NUM_PROCS}
45-
cp include/cargs.h ../../third-party/include/
46-
cp -a build/*.so ../../third-party/runtime-libs/linux/x64/
47-
cd ..
48-
4929
#
5030
# build libzedmd and copy to external
5131
#
@@ -64,7 +44,9 @@ cmake \
6444
cmake --build build -- -j${NUM_PROCS}
6545
cp src/ZeDMD.h ../../third-party/include/
6646
cp third-party/include/libserialport.h ../../third-party/include/
47+
cp third-party/include/cargs.h ../../third-party/include/
6748
cp -r third-party/include/sockpp ../../third-party/include/
49+
cp third-party/include/FrameUtil.h ../../third-party/include/
6850
cp -a third-party/runtime-libs/linux/x64/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
6951
cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
7052
cp -r test ../../
@@ -108,13 +90,3 @@ cmake --build build -- -j${NUM_PROCS}
10890
cp src/pupdmd.h ../../third-party/include/
10991
cp -a build/libpupdmd.{so,so.*} ../../third-party/runtime-libs/linux/x64/
11092
cd ..
111-
112-
#
113-
# copy libframeutil
114-
#
115-
116-
curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
117-
unzip libframeutil.zip
118-
cd libframeutil-$LIBFRAMEUTIL_SHA
119-
cp include/* ../../third-party/include
120-
cd ..

0 commit comments

Comments
 (0)