diff options
| author | Ray <[email protected]> | 2019-09-13 17:08:20 +0200 |
|---|---|---|
| committer | Ray <[email protected]> | 2019-09-13 17:08:20 +0200 |
| commit | 904a7ee03278606f9495bf897fa1ba2918700e3d (patch) | |
| tree | 7b5db94314bea170fd6c3ad1b82982539ddbb53b /src | |
| parent | 4ccf1e61be175befe339f235111441f8ca15e2f1 (diff) | |
| download | raylib-904a7ee03278606f9495bf897fa1ba2918700e3d.tar.gz raylib-904a7ee03278606f9495bf897fa1ba2918700e3d.zip | |
Update for latest emsdk configuration
Note that latest emsdk changed paths
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile index f43a722f..ac864680 100644 --- a/src/Makefile +++ b/src/Makefile @@ -147,13 +147,12 @@ endif ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables - EMSDK_PATH ?= C:/emsdk - EMSCRIPTEN_VERSION ?= 1.38.32 - 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 ifeq ($(PLATFORM),PLATFORM_ANDROID) @@ -278,7 +277,13 @@ endif # -D_DEFAULT_SOURCE use with -std=c99 on Linux and PLATFORM_WEB, required for timespec # -Werror=pointer-arith catch unportable code that does direct arithmetic on void pointers # -fno-strict-aliasing jar_xm.h does shady stuff (breaks strict aliasing) -CFLAGS += -Wall -std=c99 -D_DEFAULT_SOURCE -Wno-missing-braces -Werror=pointer-arith -fno-strict-aliasing +CFLAGS += -Wall -D_DEFAULT_SOURCE -Wno-missing-braces -Werror=pointer-arith -fno-strict-aliasing + +ifeq ($(PLATFORM), PLATFORM_WEB) + CFLAGS += -std=gnu99 +else + CFLAGS += -std=c99 +endif ifeq ($(PLATFORM_OS),LINUX) CFLAGS += -fPIC |