Skip to content

Commit b1b33b0

Browse files
danoli3danoli3
authored
Emscripten 3.1.74 - Latest Libraries (#8056)
* Emscripten API Updated to latest * emscripten, webserver configuration file apache added to file for wasm. Fixed lib exclusions emscrioten. Added memory64 option. Fixed removed commands. -pThreads enabled variable * Emscripten defines if not defined (cherry picked from commit 5b935bf) * Emscripten .htaccess for apache * Emscripten mk - glfw=2 main module=1 * Shell minimal template updated -fPIC WASM=2 (fallback js and WASM) * fPIC c/cxx flags * download_libs emscripten variants for pthreads/memory64 * module removed emscripten * WASM=1 * template off * Emscripten - Fix addons. Template add bash build script * Emscripten 3.1.73 update. CSP fixes. Working on htaccess stuff at the moment. Split template for style and script CSP requirements * Updates to Emscripten template for CSP * Updates debug * Emscripten Fixes * Fix for audio * Actions release fix * emscripten * Emscripten scripts + vcpkg install libraries script + install EMSDK script * Emscripten make + changes for vcpkg binding if set + cleanup stadard flags
1 parent 418af1c commit b1b33b0

23 files changed

+849
-370
lines changed

‎.github/workflows/of.yml

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ jobs:
3333
- uses: actions/checkout@v4
3434
- name: Docker Step
3535
run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.74 bash"
36-
# - name: Determine Release
37-
# id: vars
38-
# shell: bash
39-
# run: |
40-
# if [[ "${{ github.ref }}" == refs/tags/* ]]; then
41-
# echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
42-
# elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
43-
# echo "RELEASE=nightly" >> $GITHUB_ENV
44-
# elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
45-
# echo "RELEASE=latest" >> $GITHUB_ENV
46-
# else
47-
# echo "RELEASE=latest" >> $GITHUB_ENV
48-
# fi
36+
- name: Determine Release
37+
id: vars
38+
shell: bash
39+
run: |
40+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
41+
echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
42+
elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
43+
echo "RELEASE=nightly" >> $GITHUB_ENV
44+
elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
45+
echo "RELEASE=latest" >> $GITHUB_ENV
46+
else
47+
echo "RELEASE=latest" >> $GITHUB_ENV
48+
fi
4949
- name: Download libs
5050
run: ./scripts/$TARGET/download_libs.sh -t $RELEASE
5151
- name: Install dependencies
@@ -131,19 +131,19 @@ jobs:
131131
install: >-
132132
git
133133
unzip
134-
# - name: Determine Release
135-
# id: vars
136-
# shell: bash
137-
# run: |
138-
# if [[ "${{ github.ref }}" == refs/tags/* ]]; then
139-
# echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
140-
# elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
141-
# echo "RELEASE=nightly" >> $GITHUB_ENV
142-
# elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
143-
# echo "RELEASE=latest" >> $GITHUB_ENV
144-
# else
145-
# echo "RELEASE=latest" >> $GITHUB_ENV
146-
# fi
134+
- name: Determine Release
135+
id: vars
136+
shell: bash
137+
run: |
138+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
139+
echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
140+
elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
141+
echo "RELEASE=nightly" >> $GITHUB_ENV
142+
elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
143+
echo "RELEASE=latest" >> $GITHUB_ENV
144+
else
145+
echo "RELEASE=latest" >> $GITHUB_ENV
146+
fi
147147
- name: Install dependencies
148148
shell: msys2 {0}
149149
run: ./scripts/ci/vs/install.sh
@@ -257,19 +257,19 @@ jobs:
257257
uses: hendrikmuhs/[email protected]
258258
with:
259259
key: ${{ matrix.cfg.libs }}
260-
# - name: Determine Release
261-
# id: vars
262-
# shell: bash
263-
# run: |
264-
# if [[ "${{ github.ref }}" == refs/tags/* ]]; then
265-
# echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
266-
# elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
267-
# echo "RELEASE=nightly" >> $GITHUB_ENV
268-
# elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
269-
# echo "RELEASE=latest" >> $GITHUB_ENV
270-
# else
271-
# echo "RELEASE=latest" >> $GITHUB_ENV
272-
# fi
260+
- name: Determine Release
261+
id: vars
262+
shell: bash
263+
run: |
264+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
265+
echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
266+
elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
267+
echo "RELEASE=nightly" >> $GITHUB_ENV
268+
elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
269+
echo "RELEASE=latest" >> $GITHUB_ENV
270+
else
271+
echo "RELEASE=latest" >> $GITHUB_ENV
272+
fi
273273
- name: Download libs
274274
run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.libs}}
275275
- name: Install dependencies
@@ -297,19 +297,19 @@ jobs:
297297
uses: hendrikmuhs/[email protected]
298298
with:
299299
key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
300-
# - name: Determine Release
301-
# id: vars
302-
# shell: bash
303-
# run: |
304-
# if [[ "${{ github.ref }}" == refs/tags/* ]]; then
305-
# echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
306-
# elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
307-
# echo "RELEASE=nightly" >> $GITHUB_ENV
308-
# elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
309-
# echo "RELEASE=latest" >> $GITHUB_ENV
310-
# else
311-
# echo "RELEASE=latest" >> $GITHUB_ENV
312-
# fi
300+
- name: Determine Release
301+
id: vars
302+
shell: bash
303+
run: |
304+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
305+
echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
306+
elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
307+
echo "RELEASE=nightly" >> $GITHUB_ENV
308+
elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
309+
echo "RELEASE=latest" >> $GITHUB_ENV
310+
else
311+
echo "RELEASE=latest" >> $GITHUB_ENV
312+
fi
313313
- name: Download libs
314314
run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh -t $RELEASE
315315
- name: install
@@ -340,19 +340,19 @@ jobs:
340340
with:
341341
packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 wget2 make libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good
342342
version: 1.0
343-
# - name: Determine Release
344-
# id: vars
345-
# shell: bash
346-
# run: |
347-
# if [[ "${{ github.ref }}" == refs/tags/* ]]; then
348-
# echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
349-
# elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
350-
# echo "RELEASE=nightly" >> $GITHUB_ENV
351-
# elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
352-
# echo "RELEASE=latest" >> $GITHUB_ENV
353-
# else
354-
# echo "RELEASE=latest" >> $GITHUB_ENV
355-
# fi
343+
- name: Determine Release
344+
id: vars
345+
shell: bash
346+
run: |
347+
if [[ "${{ github.ref }}" == refs/tags/* ]]; then
348+
echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
349+
elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
350+
echo "RELEASE=nightly" >> $GITHUB_ENV
351+
elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
352+
echo "RELEASE=latest" >> $GITHUB_ENV
353+
else
354+
echo "RELEASE=latest" >> $GITHUB_ENV
355+
fi
356356
- uses: actions/checkout@v4
357357
- name: ccache
358358
uses: hendrikmuhs/[email protected]

0 commit comments

Comments
 (0)