diff --git a/Makefile b/Makefile index 871b717..e79573b 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ # PLATFORM can be 'web' or 'desktop' PLATFORM ?= desktop +SHELL := /bin/zsh TOP_BUILD_DIR := build EXECUTABLE := boids-playground WEB_SHELL := src/shell.html @@ -57,8 +58,9 @@ OBJECT_DEPENDS := $(patsubst %.o, %.d, $(OBJECTS)) LIB_DEPENDENCIES := ifeq ($(PLATFORM), web) + export EMSDK_QUIET=1 RAYLIB_PLATFORM := PLATFORM_WEB - CXX := emcc + CXX := source $(SUBMODULES_PATH)/emsdk/emsdk_env.sh $(THEN) emcc EXT = .html EMSCRIPTEN_PATH ?= $(EMSDK_PATH)/upstream/emscripten @@ -106,7 +108,6 @@ lib: submodules $(LIB_DEPENDENCIES) emsdk: submodules cd $(SUBMODULES_PATH)/emsdk $(THEN) ./emsdk install latest cd $(SUBMODULES_PATH)/emsdk $(THEN) ./emsdk activate latest - EMSDK_QUIET=1 source $(SUBMODULES_PATH)/emsdk/emsdk_env.sh # Link the program and create the executable $(MAIN_TARGET): $(OBJECTS)