Skip to content

Commit e2e3158

Browse files
committed
cosmetic/make: drop GLOBAL_* variables in favour of only *
The latter is required as it's picked up by buildsystems, the former is only used once by us and can easily be replaced by the latter.
1 parent e341e1b commit e2e3158

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44
BASE_DIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
55
DIST_DIR:=$(BASE_DIR)dist/libraries
66

7-
GLOBAL_CFLAGS:=-O3 -s USE_PTHREADS=0
8-
GLOBAL_LDFLAGS:=-s ENVIRONMENT=web,webview,worker -s NO_EXIT_RUNTIME=1
9-
export LDFLAGS = $(GLOBAL_LDFLAGS)
10-
export CFLAGS = $(GLOBAL_CFLAGS)
11-
export CXXFLAGS = $(GLOBAL_CFLAGS)
12-
7+
export LDFLAGS = -s ENVIRONMENT=web,webview,worker -s NO_EXIT_RUNTIME=1
8+
export CFLAGS = -O3 -s USE_PTHREADS=0
9+
export CXXFLAGS = $(CFLAGS)
1310
export PKG_CONFIG_PATH = $(DIST_DIR)/lib/pkgconfig
1411
export EM_PKG_CONFIG_PATH = $(PKG_CONFIG_PATH)
1512

@@ -161,7 +158,7 @@ all-src:
161158

162159
# Dist Files
163160
EMCC_COMMON_ARGS = \
164-
$(GLOBAL_LDFLAGS) \
161+
$(LDFLAGS) \
165162
-s EXPORTED_FUNCTIONS="['_main', '_malloc']" \
166163
-s EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap', 'getValue', 'FS_createPreloadedFile', 'FS_createPath']" \
167164
--use-preload-plugins \

0 commit comments

Comments
 (0)