diff options
| author | Ray <[email protected]> | 2019-09-13 17:09:23 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2019-09-13 17:09:23 +0200 |
| commit | a952c462991da81f147f12a2cfdc9ff1c4125152 (patch) | |
| tree | de8c021003c58395bbd952ecd345f6454808cbaf /examples | |
| parent | b996f011dca3d7e63ab36a7df54f3596aec1a511 (diff) | |
| download | raylib.com-a952c462991da81f147f12a2cfdc9ff1c4125152.tar.gz raylib.com-a952c462991da81f147f12a2cfdc9ff1c4125152.zip | |
Update for latest emsdk
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/web/Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/examples/web/Makefile b/examples/web/Makefile index d1bd252..8ded8b9 100644 --- a/examples/web/Makefile +++ b/examples/web/Makefile @@ -52,7 +52,7 @@ RAYLIB_H_INSTALL_PATH ?= $(DESTDIR)/include RAYLIB_LIBTYPE ?= STATIC # Build mode for project: DEBUG or RELEASE -BUILD_MODE ?= RELEASE +BUILD_MODE ?= DEBUG # Use external GLFW library instead of rglfw module # TODO: Review usage on Linux. Target version of choice. Switch on -lglfw or -lglfw3 @@ -115,13 +115,12 @@ endif ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables - EMSDK_PATH ?= C:/emsdk - EMSCRIPTEN_VERSION ?= 1.38.31 - CLANG_VERSION = e$(EMSCRIPTEN_VERSION)_64bit - PYTHON_VERSION = 2.7.13.1_64bit\python-2.7.13.amd64 - NODE_VERSION = 8.9.1_64bit - export PATH = $(EMSDK_PATH);$(EMSDK_PATH)\clang\$(CLANG_VERSION);$(EMSDK_PATH)\node\$(NODE_VERSION)\bin;$(EMSDK_PATH)\python\$(PYTHON_VERSION);$(EMSDK_PATH)\emscripten\$(EMSCRIPTEN_VERSION);C:\raylib\MinGW\bin:$$(PATH) - EMSCRIPTEN = $(EMSDK_PATH)\emscripten\$(EMSCRIPTEN_VERSION) + EMSDK_PATH ?= C:/emsdk + EMSCRIPTEN_PATH ?= $(EMSDK_PATH)/fastcomp/emscripten + CLANG_PATH = $(EMSDK_PATH)/fastcomp/bin + PYTHON_PATH = $(EMSDK_PATH)/python/2.7.13.1_64bit/python-2.7.13.amd64 + NODE_PATH = $(EMSDK_PATH)/node/12.9.1_64bit/bin + export PATH = $(EMSDK_PATH);$(EMSCRIPTEN_PATH);$(CLANG_PATH);$(NODE_PATH);$(PYTHON_PATH);C:\raylib\MinGW\bin:$$(PATH) endif # Define raylib release directory for compiled library. @@ -507,7 +506,7 @@ core/core_window_letterbox: core/core_window_letterbox.c # compile [core] example - drop files # NOTE: File drop not supported on PLATFORM_ANDROID and PLATFORM_RPI (native) core/core_drop_files: core/core_drop_files.c - $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) -s FORCE_FILESYSTEM=1 + $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) -s TOTAL_MEMORY=67108864 -s FORCE_FILESYSTEM=1 # compile [core] example - generate random values core/core_random_values: core/core_random_values.c @@ -523,7 +522,7 @@ core/core_vr_simulator: core/core_vr_simulator.c --preload-file core/resources/distortion100.fs@resources/distortion100.fs core/core_loading_thread: core/core_loading_thread.c - $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -lpthread -D$(PLATFORM) -s USE_PTHREADS=1 -s ASSERTIONS=1 + $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -lpthread -D$(PLATFORM) -s USE_PTHREADS=1 # compile [shapes] example - basic shapes usage (rectangle, circle, ...) shapes/shapes_basic_shapes: shapes/shapes_basic_shapes.c @@ -603,7 +602,7 @@ textures/textures_image_drawing: textures/textures_image_drawing.c # compile [textures] example - texture image generation textures/textures_image_generation: textures/textures_image_generation.c - $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) -s ALLOW_MEMORY_GROWTH=1 + $(CC) -o $@$(EXT) $< $(CFLAGS) $(INCLUDE_PATHS) $(LDFLAGS) $(LDLIBS) -D$(PLATFORM) -s TOTAL_MEMORY=67108864 # compile [textures] example - texture image processing textures/textures_image_processing: textures/textures_image_processing.c |