Skip to content

Commit

Permalink
Split Makefile and add build flags
Browse files Browse the repository at this point in the history
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
  • Loading branch information
TFSThiagoBR98 authored and TheOneric committed Mar 21, 2022
1 parent ab5d440 commit 196d765
Show file tree
Hide file tree
Showing 28 changed files with 675 additions and 688 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ node_modules/
build/lib
src/SubOctpInterface.cpp
src/SubOctpInterface.js
build/__pycache__/
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM emscripten/emsdk:2.0.20
FROM docker.io/emscripten/emsdk:3.1.3

RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
Expand All @@ -10,6 +10,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
itstool \
pkg-config \
python3 \
python3-pip \
python3-setuptools \
python3-wheel \
ninja-build \
python3-ply \
gettext \
autopoint \
Expand All @@ -18,7 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
m4 \
gperf \
licensecheck \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& pip3 install meson

WORKDIR /code
CMD ["make"]
Loading

0 comments on commit 196d765

Please sign in to comment.