Skip to content

Commit 02ef3e0

Browse files
committed
make: move ENVIRONMENT and NO_EXIT_RUNTIME to global flags
All builds but brotli already set those manually and in brotli's case it was probably an oversight for them to be missing. Also they are lining and not compilation flags.
1 parent 7d66651 commit 02ef3e0

1 file changed

Lines changed: 1 addition & 17 deletions

File tree

Makefile

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ BASE_DIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
55
DIST_DIR:=$(BASE_DIR)dist/libraries
66

77
GLOBAL_CFLAGS:=-O3
8-
GLOBAL_LDFLAGS:=-s ENVIRONMENT=web,webview
8+
GLOBAL_LDFLAGS:=-s ENVIRONMENT=web,webview -s NO_EXIT_RUNTIME=1 -s MODULARIZE=1
99
export LDFLAGS = $(GLOBAL_LDFLAGS)
1010

1111
all: subtitleoctopus
@@ -27,9 +27,7 @@ $(DIST_DIR)/lib/libfribidi.a: build/lib/fribidi/configure
2727
-s USE_PTHREADS=0 \
2828
$(GLOBAL_CFLAGS) \
2929
-s NO_FILESYSTEM=1 \
30-
-s NO_EXIT_RUNTIME=1 \
3130
-DFRIBIDI_ENTRY=extern \
32-
-s MODULARIZE=1 \
3331
" \
3432
--prefix="$(DIST_DIR)" \
3533
--host=x86-none-linux \
@@ -53,8 +51,6 @@ $(DIST_DIR)/lib/libexpat.a: build/lib/expat/configured
5351
-s USE_PTHREADS=0 \
5452
$(GLOBAL_CFLAGS) \
5553
-s NO_FILESYSTEM=1 \
56-
-s NO_EXIT_RUNTIME=1 \
57-
-s MODULARIZE=1 \
5854
" \
5955
-DCMAKE_INSTALL_PREFIX=$(DIST_DIR) \
6056
-DEXPAT_BUILD_DOCS=off \
@@ -115,8 +111,6 @@ build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a: $(DIST_DIR)/lib/libbrotli
115111
-s USE_PTHREADS=0 \
116112
$(GLOBAL_CFLAGS) \
117113
-s NO_FILESYSTEM=1 \
118-
-s NO_EXIT_RUNTIME=1 \
119-
-s MODULARIZE=1 \
120114
" \
121115
--prefix="$$(pwd)/dist_hb" \
122116
--host=x86-none-linux \
@@ -149,16 +143,12 @@ $(DIST_DIR)/lib/libharfbuzz.a: build/lib/freetype/build_hb/dist_hb/lib/libfreety
149143
$(GLOBAL_CFLAGS) \
150144
-s NO_FILESYSTEM=1 \
151145
-DHB_NO_MT \
152-
-s NO_EXIT_RUNTIME=1 \
153-
-s MODULARIZE=1 \
154146
" \
155147
CXXFLAGS=" \
156148
-s USE_PTHREADS=0 \
157149
$(GLOBAL_CFLAGS) \
158150
-s NO_FILESYSTEM=1 \
159151
-DHB_NO_MT \
160-
-s NO_EXIT_RUNTIME=1 \
161-
-s MODULARIZE=1 \
162152
" \
163153
--prefix="$(DIST_DIR)" \
164154
--host=x86-none-linux \
@@ -185,8 +175,6 @@ $(DIST_DIR)/lib/libfreetype.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/lib
185175
-s USE_PTHREADS=0 \
186176
$(GLOBAL_CFLAGS) \
187177
-s NO_FILESYSTEM=1 \
188-
-s NO_EXIT_RUNTIME=1 \
189-
-s MODULARIZE=1 \
190178
" \
191179
--prefix="$(DIST_DIR)" \
192180
--host=x86-none-linux \
@@ -218,8 +206,6 @@ $(DIST_DIR)/lib/libfontconfig.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/l
218206
-s USE_PTHREADS=0 \
219207
-DEMSCRIPTEN \
220208
$(GLOBAL_CFLAGS) \
221-
-s NO_EXIT_RUNTIME=1 \
222-
-s MODULARIZE=1 \
223209
" \
224210
--prefix="$(DIST_DIR)" \
225211
--host=x86-none-linux \
@@ -248,8 +234,6 @@ $(DIST_DIR)/lib/libass.a: $(DIST_DIR)/lib/libfontconfig.a $(DIST_DIR)/lib/libhar
248234
CFLAGS=" \
249235
-s USE_PTHREADS=0 \
250236
$(GLOBAL_CFLAGS) \
251-
-s NO_EXIT_RUNTIME=1 \
252-
-s MODULARIZE=1 \
253237
" \
254238
--prefix="$(DIST_DIR)" \
255239
--host=x86-none-linux \

0 commit comments

Comments
 (0)