Compare commits

..

2 commits

Author SHA1 Message Date
fc3dd1d4a4 Modify wasm Makefile to support alt emsdk sh path
Some checks failed
Build and Publish WASM version of demo / Build-And-Deploy-main (push) Has been skipped
Build and Publish WASM version of demo / Build-And-Deploy-devel (push) Failing after 1s
2023-12-12 16:24:09 +09:00
fe1ccff585 Clone and build Raylib instead of storing lib
Instead of storing pre-built Raylib lib and headers, use a script to
build Raylib on-demand for WASM builds.
2023-12-12 16:18:25 +09:00
6 changed files with 137 additions and 3856 deletions

View file

@ -0,0 +1,126 @@
#!/usr/bin/env bash
EMSDK_ENV_SCRIPT="${HOME}/git/emsdk/emsdk_env.sh"
OUTPUT_DIR="$(dirname "$0")/raylib_out"
CLONE_DIR="$(dirname "$0")/raylib_clone"
RAYLIB_GIT_URL="https://github.com/raysan5/raylib.git"
RAYLIB_GIT_TAG="5.0"
while getopts 'o:e:c:h' opt; do
case $opt in
'o')
OUTPUT_DIR="$OPTARG";;
'e')
EMSDK_ENV_SCRIPT="$OPTARG";;
'c')
CLONE_DIR="$OPTARG";;
'h')
echo "-o <output_dir>"
echo "-e <emsdk_env_sh>"
echo "-c <clone_dir>"
exit 0;;
esac
done
# Validate args
if [[ -z "$OUTPUT_DIR" ]]; then
echo 'ERROR: The OUTPUT_DIR variable is an empty string!'
exit 1
elif ! [[ -d "$OUTPUT_DIR" ]]; then
if ! mkdir -p "$OUTPUT_DIR"; then
echo "ERROR: Failed to 'mkdir -p \"$OUTPUT_DIR\"!"
exit 2
fi
fi
pushd "$OUTPUT_DIR" >&/dev/null
OUTPUT_DIR="$(pwd)"
popd >&/dev/null
#echo "Using output dir: $OUTPUT_DIR"
pushd "$CLONE_DIR" >&/dev/null
CLONE_DIR="$(pwd)"
popd >&/dev/null
#echo "Using clone dir: $CLONE_DIR"
if ! [[ -r "$EMSDK_ENV_SCRIPT" ]]; then
echo "ERROR: \"$EMSDK_ENV_SCRIPT\" is not readable!"
exit 3
fi
# Validate and set up Raylib git clone
if ! [[ -d "$CLONE_DIR" ]]; then
if ! git clone --depth 1 --no-single-branch "$RAYLIB_GIT_URL" "$CLONE_DIR"; then
echo "ERROR: Failed to clone Raylib into \"$CLONE_DIR\"!"
exit 4
fi
elif ! (cd "$CLONE_DIR" && git fetch --all -p && git checkout "$RAYLIB_GIT_TAG"); then
echo "ERROR: Failed to fetch/checkout in Raylib dir!"
exit 5
fi
function cleanup() {
cd "$CLONE_DIR"
git clean -xfd
git restore .
}
trap cleanup EXIT
set -ve
pushd "$CLONE_DIR" >&/dev/null
# Patch for building for wasm.
patch -N -p1 <<"EOF"
Do not allow F12 usage as that is used in the browser for debugging purposes.
For some reason, the variable `screenshotCounter` is still used.
--- a/src/config.h
+++ b/src/config.h
@@ -59,7 +59,7 @@
// Use a partial-busy wait loop, in this case frame sleeps for most of the time, but then runs a busy loop at the end for accuracy
#define SUPPORT_PARTIALBUSY_WAIT_LOOP 1
// Allow automatic screen capture of current screen pressing F12, defined in KeyCallback()
-#define SUPPORT_SCREEN_CAPTURE 1
+//#define SUPPORT_SCREEN_CAPTURE 1
// Allow automatic gif recording of current screen pressing CTRL+F12, defined in KeyCallback()
#define SUPPORT_GIF_RECORDING 1
// Support CompressData() and DecompressData() functions
--- a/src/rcore.c
+++ b/src/rcore.c
@@ -349,9 +349,7 @@ RLAPI const char *raylib_version = RAYLIB_VERSION; // raylib version exported s
CoreData CORE = { 0 }; // Global CORE state context
-#if defined(SUPPORT_SCREEN_CAPTURE)
static int screenshotCounter = 0; // Screenshots counter
-#endif
#if defined(SUPPORT_GIF_RECORDING)
int gifFrameCounter = 0; // GIF frames counter
EOF
# Do the build
pushd src >&/dev/null
(source "$EMSDK_ENV_SCRIPT"; make PLATFORM=PLATFORM_WEB)
# Save the library
install -D -m444 libraylib.a "$OUTPUT_DIR/lib/libraylib.a"
# Save the library and relevant headers
for header in libraylib.a raylib.h raymath.h; do
install -D -m444 "$header" "$OUTPUT_DIR/include/$header"
done
popd >&/dev/null
popd >&/dev/null
echo Success

View file

@ -3,3 +3,5 @@
/jumpartifact.com_demo_0.wasm
/jumpartifact.com_demo_0.data
/objdir/
/raylib
/raylib_git

View file

@ -38,13 +38,18 @@ 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
jumpartifact.com_demo_0.html: ${OBJECTS} ${HEADERS}
raylib/lib/libraylib.a raylib/include/raylib.h raylib/include/raymath.h:
../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 \
-s USE_GLFW=3 -I../wasm_include -L../wasm_lib -lraylib \
-s USE_GLFW=3 -Iraylib/include -Lraylib/lib -lraylib \
--shell-file custom_shell.html \
-sEXPORTED_FUNCTIONS=_main \
-sEXPORTED_RUNTIME_METHODS=ccall \
@ -68,4 +73,4 @@ format:
${OBJDIR}/%.cc.o: $$(subst PREVDIR,..,%.cc) ${HEADERS}
@mkdir -p "$(dir $@)"
${CXX} -std=c++20 -I../wasm_include -c ${OTHER_FLAGS} -o $@ $<
${CXX} -std=c++20 -Iraylib/include -c ${OTHER_FLAGS} -o $@ $<

1662
wasm_include/raylib.h vendored

File diff suppressed because it is too large Load diff

2190
wasm_include/raymath.h vendored

File diff suppressed because it is too large Load diff

Binary file not shown.