Skip to content

Commit b71a3aa

Browse files
TFSThiagoBR98TheOneric
authored andcommitted
Split Makefile and add build flags
This commit add support to build flags Currently is included: support for pthreads, LTO builds and Debug builds. Emscripten docker image is updated from 2.0.20 to 3.1.3. Split the Makefile into several files to build/m4. Changed from Autotools to Meson where its possible, to reduce the number of patches. Removed libass.cpp, this can be implemented in SubtitleOctopus.cpp Add zip task to make bundles
1 parent abc1d67 commit b71a3aa

28 files changed

+675
-688
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ node_modules/
3232
build/lib
3333
src/SubOctpInterface.cpp
3434
src/SubOctpInterface.js
35+
build/__pycache__/

Dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM emscripten/emsdk:2.0.20
1+
FROM docker.io/emscripten/emsdk:3.1.3
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
build-essential \
@@ -10,6 +10,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
itstool \
1111
pkg-config \
1212
python3 \
13+
python3-pip \
14+
python3-setuptools \
15+
python3-wheel \
16+
ninja-build \
1317
python3-ply \
1418
gettext \
1519
autopoint \
@@ -18,7 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1822
m4 \
1923
gperf \
2024
licensecheck \
21-
&& rm -rf /var/lib/apt/lists/*
25+
&& rm -rf /var/lib/apt/lists/* \
26+
&& pip3 install meson
2227

2328
WORKDIR /code
2429
CMD ["make"]

0 commit comments

Comments
 (0)