From fc3dd1d4a49d8566456c52008d0f531fffa8c0c0 Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Tue, 12 Dec 2023 16:24:09 +0900 Subject: [PATCH] Modify wasm Makefile to support alt emsdk sh path --- wasm_build/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wasm_build/Makefile b/wasm_build/Makefile index f3fed9d..635e99d 100644 --- a/wasm_build/Makefile +++ b/wasm_build/Makefile @@ -38,12 +38,14 @@ HEADERS = \ OBJECTS = $(addprefix ${OBJDIR}/,$(subst ..,PREVDIR,$(subst .cc,.cc.o,${SOURCES}))) -CXX = source ${HOME}/git/emsdk/emsdk_env.sh &>/dev/null && em++ +EMSDK_ENV_SH ?= ${HOME}/git/emsdk/emsdk_env.sh + +CXX = source ${EMSDK_ENV_SH} &>/dev/null && em++ all: | format jumpartifact.com_demo_0.html raylib/lib/libraylib.a raylib/include/raylib.h raylib/include/raymath.h: - ../third_party_build/wasm_make_raylib.sh -o raylib -c raylib_git + ../third_party_build/wasm_make_raylib.sh -o raylib -c raylib_git -e ${EMSDK_ENV_SH} jumpartifact.com_demo_0.html: raylib/lib/libraylib.a raylib/include/raylib.h raylib/include/raymath.h ${OBJECTS} ${HEADERS} ${CXX} -std=c++20 -o jumpartifact.com_demo_0.html \ -- 2.49.0