Skip to content

Commit 9e6c1c3

Browse files
committed
Implement WebSocket
1 parent 6f261b3 commit 9e6c1c3

File tree

73 files changed

+755
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+755
-91
lines changed

.github/workflows/linux.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
run: |
5252
sudo apt-get -qq update
5353
sudo apt-get install -y autopoint libftgl-dev freeglut3-dev libcurl4-openssl-dev libxmu-dev libxi-dev libfcgi-dev libxss-dev libnotify-dev libxcb-util0-dev libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev libwebkit2gtk-4.1-dev p7zip-full libxxf86vm-dev ocl-icd-opencl-dev zip libltdl-dev
54+
linux/ci_compile_ixwebsocket.sh
5455
5556
- name: Install dependencies for manager
5657
if: success() && matrix.type == 'manager'
@@ -285,10 +286,15 @@ jobs:
285286
sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list
286287
sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list
287288
289+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
290+
with:
291+
fetch-depth: 2
292+
288293
- name: Install dependencies
289294
run: |
290295
apt-get -qq update
291-
apt-get install -y make build-essential m4 pkg-config autoconf libtool git p7zip-full python3
296+
apt-get install -y make build-essential m4 pkg-config autoconf libtool git p7zip-full python3 zlib1g-dev libssl-dev cmake
297+
linux/ci_compile_ixwebsocket.sh no_sudo
292298
293299
- name: Install dependencies for x86
294300
if: success() && matrix.type == 'apps-x86'
@@ -307,10 +313,6 @@ jobs:
307313
run: |
308314
apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu wget ca-certificates
309315
310-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
311-
with:
312-
fetch-depth: 2
313-
314316
- name: Automake
315317
if: success()
316318
run: ./_autosetup

.github/workflows/mingw.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ jobs:
5959
run: |
6060
sudo apt-get -qq update
6161
sudo apt-get install -y mingw-w64 mingw-w64-tools mingw-w64-x86-64-dev mingw-w64-i686-dev tar curl zip unzip p7zip-full
62+
sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
63+
sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
6264
6365
- name: Make libs with mingw
6466
if: success() && matrix.type == 'libs-mingw'

3rdParty/buildMacDependencies.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ download_and_build "${curlDirName}" "${curlFileName}" "${curlURL}" "${ROOTDIR}/m
161161
download_and_build "${wxWidgetsDirName}" "${wxWidgetsFileName}" "${wxWidgetsURL}" "${ROOTDIR}/mac_build/buildWxMac.sh ${wxoption}" "libwx_osx_cocoa_static.a" "x86_64 arm64"
162162
download_and_build "${freetypeDirName}" "${freetypeFileName}" "${freetypeURL}" "${ROOTDIR}/mac_build/buildfreetype.sh" "libfreetype.a" "x86_64 arm64"
163163
download_and_build "${ftglDirName}" "${ftglFileName}" "${ftglURL}" "${ROOTDIR}/mac_build/buildFTGL.sh" "libftgl.a" "x86_64 arm64"
164+
download_and_build "${ixwebsocketDirName}" "${ixwebsocketFileName}" "${ixwebsocketURL}" "${ROOTDIR}/osx/ci_compile_ixwebsocket.sh" "libixwebsocket.a" "x86_64 arm64"
164165

165166
# change back to root directory
166167
cd ${ROOTDIR} || exit 1

3rdParty/vcpkg_ports/configs/apps/android/vcpkg.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
"features": ["ssl3", "weak-ssl-ciphers"],
1313
"default-features": false
1414
},
15-
"rappture"
15+
"rappture",
16+
{
17+
"name": "ixwebsocket",
18+
"features": ["openssl"],
19+
"default-features": false
20+
}
1621
]
1722
}

3rdParty/vcpkg_ports/configs/apps/linux/vcpkg.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
"rappture",
1616
"opencl",
1717
"ftgl",
18-
"freeglut"
18+
"freeglut",
19+
{
20+
"name": "ixwebsocket",
21+
"features": ["openssl"],
22+
"default-features": false
23+
}
1924
]
2025
}

3rdParty/vcpkg_ports/configs/apps/mingw/vcpkg.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
"rappture",
1616
"ftgl",
1717
"freeglut",
18-
"libjpeg-turbo"
18+
"libjpeg-turbo",
19+
{
20+
"name": "ixwebsocket",
21+
"features": ["openssl"],
22+
"default-features": false
23+
}
1924
]
2025
}

3rdParty/vcpkg_ports/configs/client/vcpkg.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
"features": ["ssl3", "weak-ssl-ciphers"],
1313
"default-features": false
1414
},
15-
"freetype"
15+
"freetype",
16+
{
17+
"name": "ixwebsocket",
18+
"features": ["openssl"],
19+
"default-features": false
20+
}
1621
]
1722
}

3rdParty/vcpkg_ports/configs/libs/vcpkg.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
"features": ["ssl3", "weak-ssl-ciphers"],
1313
"default-features": false
1414
},
15-
"gtest"
15+
"gtest",
16+
{
17+
"name": "ixwebsocket",
18+
"features": ["openssl"],
19+
"default-features": false
20+
}
1621
]
1722
}

3rdParty/vcpkg_ports/configs/libs/windows/vcpkg.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
"name": "openssl",
1212
"features": ["ssl3", "weak-ssl-ciphers"],
1313
"default-features": false
14+
},
15+
{
16+
"name": "ixwebsocket",
17+
"features": ["openssl"],
18+
"default-features": false
1419
}
1520
]
1621
}

3rdParty/vcpkg_ports/configs/manager/linux/vcpkg.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
"name": "gdk-pixbuf",
2323
"features": ["jpeg", "png", "svg", "tiff", "others"],
2424
"default-features": false
25+
},
26+
{
27+
"name": "ixwebsocket",
28+
"features": ["openssl"],
29+
"default-features": false
2530
}
2631
]
2732
}

0 commit comments

Comments
 (0)