@@ -8,6 +8,9 @@ GLOBAL_CFLAGS:=-O3 -s USE_PTHREADS=0
88GLOBAL_LDFLAGS: =-s ENVIRONMENT=web,webview,worker -s NO_EXIT_RUNTIME=1
99export LDFLAGS = $(GLOBAL_LDFLAGS )
1010
11+ export PKG_CONFIG_PATH = $(DIST_DIR ) /lib/pkgconfig
12+ export EM_PKG_CONFIG_PATH = $(PKG_CONFIG_PATH )
13+
1114all : subtitleoctopus
1215subtitleoctopus : dist
1316
@@ -91,7 +94,6 @@ build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a: $(DIST_DIR)/lib/libbrotli
9194 cd build/lib/freetype && \
9295 mkdir -p build_hb && \
9396 cd build_hb && \
94- EM_PKG_CONFIG_PATH=$(DIST_DIR ) /lib/pkgconfig \
9597 emconfigure ../configure \
9698 CFLAGS=" \
9799 $(GLOBAL_CFLAGS ) \
@@ -118,7 +120,7 @@ build/lib/harfbuzz/configure: lib/harfbuzz $(wildcard $(BASE_DIR)build/patches/h
118120
119121$(DIST_DIR ) /lib/libharfbuzz.a : build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a build/lib/harfbuzz/configure
120122 cd build/lib/harfbuzz && \
121- EM_PKG_CONFIG_PATH=$(DIST_DIR ) /lib/pkgconfig :$(BASE_DIR ) build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
123+ EM_PKG_CONFIG_PATH=$(PKG_CONFIG_PATH ) :$(BASE_DIR ) build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
122124 emconfigure ./configure \
123125 CFLAGS=" \
124126 $(GLOBAL_CFLAGS ) \
@@ -147,7 +149,7 @@ $(DIST_DIR)/lib/libharfbuzz.a: build/lib/freetype/build_hb/dist_hb/lib/libfreety
147149# Freetype with Harfbuzz
148150$(DIST_DIR ) /lib/libfreetype.a : $(DIST_DIR ) /lib/libharfbuzz.a $(DIST_DIR ) /lib/libbrotlidec.a
149151 cd build/lib/freetype && \
150- EM_PKG_CONFIG_PATH=$(DIST_DIR ) /lib/pkgconfig :$(BASE_DIR ) build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
152+ EM_PKG_CONFIG_PATH=$(PKG_CONFIG_PATH ) :$(BASE_DIR ) build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
151153 emconfigure ./configure \
152154 CFLAGS=" \
153155 $(GLOBAL_CFLAGS ) \
@@ -174,7 +176,6 @@ build/lib/fontconfig/configure: lib/fontconfig $(wildcard $(BASE_DIR)build/patch
174176
175177$(DIST_DIR ) /lib/libfontconfig.a : $(DIST_DIR ) /lib/libharfbuzz.a $(DIST_DIR ) /lib/libexpat.a $(DIST_DIR ) /lib/libfribidi.a $(DIST_DIR ) /lib/libfreetype.a build/lib/fontconfig/configure
176178 cd build/lib/fontconfig && \
177- EM_PKG_CONFIG_PATH=$(DIST_DIR ) /lib/pkgconfig \
178179 emconfigure ./configure \
179180 CFLAGS=" \
180181 $(GLOBAL_CFLAGS ) \
@@ -200,7 +201,6 @@ build/lib/libass/configured: lib/libass
200201
201202$(DIST_DIR ) /lib/libass.a : $(DIST_DIR ) /lib/libfontconfig.a $(DIST_DIR ) /lib/libharfbuzz.a $(DIST_DIR ) /lib/libexpat.a $(DIST_DIR ) /lib/libfribidi.a $(DIST_DIR ) /lib/libfreetype.a $(DIST_DIR ) /lib/libbrotlidec.a build/lib/libass/configured
202203 cd build/lib/libass && \
203- EM_PKG_CONFIG_PATH=$(DIST_DIR ) /lib/pkgconfig \
204204 emconfigure ../../../lib/libass/configure \
205205 CFLAGS=" \
206206 $(GLOBAL_CFLAGS ) \
@@ -232,7 +232,6 @@ OCTP_DEPS = \
232232src/subtitles-octopus-worker.bc : $(OCTP_DEPS ) all-src
233233.PHONY : all-src
234234all-src :
235- PKG_CONFIG_PATH=$(DIST_DIR ) /lib/pkgconfig \
236235 $(MAKE ) -C src all
237236
238237# Dist Files
0 commit comments