Skip to content

Commit bcb81a3

Browse files
committed
add -nomvp to fix bgfx dynamic linking
1 parent 1e8dfd1 commit bcb81a3

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

scripts/emsdk-fetch.sh

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ COMMON="-Wno-unused-command-line-argument -Wno-unreachable-code-fallthrough -Wno
100100
SHARED=""
101101
IS_SHARED=false
102102
PY_MODULE=false
103+
MVP=true
104+
103105
for arg do
104106
shift
105107
@@ -120,6 +122,12 @@ for arg do
120122
continue
121123
fi
122124
125+
if [ "\$arg" = "-nomvp" ]
126+
then
127+
MVP=false
128+
continue
129+
fi
130+
123131
# that is for some very bad setup.py behaviour regarding cross compiling. should not be needed ..
124132
[ "\$arg" = "-I/usr/include" ] && continue
125133
[ "\$arg" = "-I/usr/include/SDL2" ] && continue
@@ -171,11 +179,14 @@ done
171179
if \$IS_SHARED
172180
then
173181
$EMSDK_PYTHON -E \$0.py \$SHARED $COPTS $LDFLAGS -sSIDE_MODULE -gsource-map --source-map-base / "\$@" \$COMMON
174-
SOTMP=\$(mktemp).so
175-
mv \$SHARED_TARGET \$SOTMP
176-
$SDKROOT/emsdk/upstream/bin/wasm-emscripten-finalize -mvp \$SOTMP -o \$SHARED_TARGET
177-
[ -f \$SHARED_TARGET.map ] && rm \$SHARED_TARGET.map
178-
rm \$SOTMP
182+
if \$MVP
183+
then
184+
SOTMP=\$(mktemp).so
185+
mv \$SHARED_TARGET \$SOTMP
186+
$SDKROOT/emsdk/upstream/bin/wasm-emscripten-finalize -mvp \$SOTMP -o \$SHARED_TARGET
187+
[ -f \$SHARED_TARGET.map ] && rm \$SHARED_TARGET.map
188+
rm \$SOTMP
189+
fi
179190
else
180191
$EMSDK_PYTHON -E \$0.py \$COPTS \$CPPFLAGS -DBUILD_STATIC "\$@" \$COMMON
181192
fi

0 commit comments

Comments
 (0)