ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-01 12:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make build_box2d.sh more flexible

Browse Source 
Removed the `odin root` call.
Seperated the clean rule in wasm.Makefile to enable parallel builds.
This commit is contained in:
jason
2025-05-01 22:42:32 -04:00
parent 777c33a9a1
commit 87f5b96fcc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/box2d/build_box2d.sh
Vendored
+3 -2
View File
@@ -4,7 +4,7 @@ set -eu
VERSION="3.1.0" VERSION="3.1.0"
RELEASE="https://github.com/erincatto/box2d/archive/refs/tags/v$VERSION.tar.gz" RELEASE="https://github.com/erincatto/box2d/archive/refs/tags/v$VERSION.tar.gz"
cd "$(odin root)"/vendor/box2d cd "$(dirname "$0")"
curl -O -L "$RELEASE" curl -O -L "$RELEASE"
tar -xzvf "v$VERSION.tar.gz" tar -xzvf "v$VERSION.tar.gz"
@@ -58,7 +58,7 @@ Darwin)
*) *)
rm -rf build rm -rf build
mkdir build mkdir build
cmake $FLAGS -DCMAKE_OSX_ARCHITECTURES=arm64 -S . -B build cmake $FLAGS -S . -B build
cmake --build build cmake --build build
cp build/src/libbox2d.a ../lib/box2d_other.a cp build/src/libbox2d.a ../lib/box2d_other.a
;; ;;
@@ -73,6 +73,7 @@ make -f wasm.Makefile
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
printf "\e[30;43mwarning:\e[0m Native Box2D libraries were built successfully, the WASM build failed, likely because your default C compiler and/or linker doesn't support WASM, you can set the CC and LD environment variables to point to a compiler and linker that support it\n" printf "\e[30;43mwarning:\e[0m Native Box2D libraries were built successfully, the WASM build failed, likely because your default C compiler and/or linker doesn't support WASM, you can set the CC and LD environment variables to point to a compiler and linker that support it\n"
fi fi
make -f wasm.Makefile clean
set -e set -e
rm -rf "v$VERSION.tar.gz" rm -rf "v$VERSION.tar.gz"
vendor/box2d/wasm.Makefile
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ OBJS = $(SRCS:.c=.o)
SYSROOT = $(shell odin root)/vendor/libc SYSROOT = $(shell odin root)/vendor/libc
CFLAGS = -Ibox2d-$(VERSION)/include --target=wasm32 -D__EMSCRIPTEN__ -DNDEBUG -O3 --sysroot=$(SYSROOT) CFLAGS = -Ibox2d-$(VERSION)/include --target=wasm32 -D__EMSCRIPTEN__ -DNDEBUG -O3 --sysroot=$(SYSROOT)
all: lib/box2d_wasm.o lib/box2d_wasm_simd.o clean all: lib/box2d_wasm.o lib/box2d_wasm_simd.o
%.o: %.c %.o: %.c
$(CC) -c $(CFLAGS) -DBOX2D_DISABLE_SIMD $< -o $@ $(CC) -c $(CFLAGS) -DBOX2D_DISABLE_SIMD $< -o $@