diff options
| author | Ray <raysan5@gmail.com> | 2018-11-23 17:03:07 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2018-11-23 17:03:07 +0100 |
| commit | 2deb35be2746a9cbe7f1696c301045f58d4eb67c (patch) | |
| tree | 1622d817669ab6c5dbb357c76cd4da77b2ac797a /src | |
| parent | bc8d3f30ec20140845c69c8085b7ca54a12f2b4b (diff) | |
| download | raylib-2deb35be2746a9cbe7f1696c301045f58d4eb67c.tar.gz raylib-2deb35be2746a9cbe7f1696c301045f58d4eb67c.zip | |
Review emscripten path
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile b/src/Makefile index 0cfc82c1..70e8893c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -148,9 +148,9 @@ endif ifeq ($(PLATFORM),PLATFORM_WEB) # Emscripten required variables - EMSDK_PATH = C:/emsdk - EMSCRIPTEN_VERSION = 1.38.8 - CLANG_VERSION = e1.38.8_64bit + EMSDK_PATH = D:/emsdk + EMSCRIPTEN_VERSION = 1.38.20 + CLANG_VERSION = e1.38.20_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) @@ -202,7 +202,7 @@ ifeq ($(PLATFORM),PLATFORM_RPI) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/rpi endif ifeq ($(PLATFORM),PLATFORM_WEB) - RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/html5 + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/src endif ifeq ($(PLATFORM),PLATFORM_ANDROID) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/android/$(ANDROID_ARCH_NAME) @@ -440,16 +440,16 @@ endif # Compile raylib library # NOTE: Release directory is created if not exist raylib: $(OBJS) -ifeq ($(PLATFORM_OS),WINDOWS) - if not exist $(RAYLIB_RELEASE_PATH) mkdir $(RAYLIB_RELEASE_PATH) -else - mkdir -p $(RAYLIB_RELEASE_PATH) -endif ifeq ($(PLATFORM),PLATFORM_WEB) # Compile raylib for web. emcc -O1 $(OBJS) -o $(RAYLIB_RELEASE_PATH)/libraylib.bc @echo "raylib library generated (libraylib.bc)!" else + ifeq ($(PLATFORM_OS),WINDOWS) + if not exist $(RAYLIB_RELEASE_PATH) mkdir $(RAYLIB_RELEASE_PATH) + else + mkdir -p $(RAYLIB_RELEASE_PATH) + endif ifeq ($(RAYLIB_LIBTYPE),SHARED) ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),WINDOWS) |