Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
#	libs/raylib/.gitignore
#	libs/raylib/BINDINGS.md
#	libs/raylib/CHANGELOG
#	libs/raylib/CMakeLists.txt
#	libs/raylib/CONTRIBUTING.md
#	libs/raylib/HISTORY.md
#	libs/raylib/LICENSE
#	libs/raylib/README.md
#	libs/raylib/ROADMAP.md
#	libs/raylib/SPONSORS.md
#	libs/raylib/raylib.pc.in
#	libs/raylib/src/CMakeLists.txt
#	libs/raylib/src/Makefile
#	libs/raylib/src/camera.h
#	libs/raylib/src/config.h
#	libs/raylib/src/core.c
#	libs/raylib/src/easings.h
#	libs/raylib/src/external/cgltf.h
#	libs/raylib/src/external/dr_flac.h
#	libs/raylib/src/external/dr_mp3.h
#	libs/raylib/src/external/dr_wav.h
#	libs/raylib/src/external/glfw/CMake/glfw3.pc.in
#	libs/raylib/src/external/glfw/CMake/glfw3Config.cmake.in
#	libs/raylib/src/external/glfw/CMakeLists.txt
#	libs/raylib/src/external/glfw/README.md
#	libs/raylib/src/external/glfw/include/GLFW/glfw3.h
#	libs/raylib/src/external/glfw/src/cocoa_init.m
#	libs/raylib/src/external/glfw/src/cocoa_joystick.h
#	libs/raylib/src/external/glfw/src/cocoa_joystick.m
#	libs/raylib/src/external/glfw/src/cocoa_monitor.m
#	libs/raylib/src/external/glfw/src/cocoa_platform.h
#	libs/raylib/src/external/glfw/src/cocoa_window.m
#	libs/raylib/src/external/glfw/src/egl_context.c
#	libs/raylib/src/external/glfw/src/egl_context.h
#	libs/raylib/src/external/glfw/src/glfw_config.h.in
#	libs/raylib/src/external/glfw/src/init.c
#	libs/raylib/src/external/glfw/src/input.c
#	libs/raylib/src/external/glfw/src/internal.h
#	libs/raylib/src/external/glfw/src/linux_joystick.c
#	libs/raylib/src/external/glfw/src/linux_joystick.h
#	libs/raylib/src/external/glfw/src/mappings.h
#	libs/raylib/src/external/glfw/src/nsgl_context.m
#	libs/raylib/src/external/glfw/src/null_init.c
#	libs/raylib/src/external/glfw/src/null_joystick.c
#	libs/raylib/src/external/glfw/src/null_monitor.c
#	libs/raylib/src/external/glfw/src/null_platform.h
#	libs/raylib/src/external/glfw/src/null_window.c
#	libs/raylib/src/external/glfw/src/osmesa_context.h
#	libs/raylib/src/external/glfw/src/wgl_context.h
#	libs/raylib/src/external/glfw/src/win32_init.c
#	libs/raylib/src/external/glfw/src/win32_joystick.c
#	libs/raylib/src/external/glfw/src/win32_joystick.h
#	libs/raylib/src/external/glfw/src/win32_monitor.c
#	libs/raylib/src/external/glfw/src/win32_platform.h
#	libs/raylib/src/external/glfw/src/win32_window.c
#	libs/raylib/src/external/glfw/src/window.c
#	libs/raylib/src/external/glfw/src/wl_init.c
#	libs/raylib/src/external/glfw/src/wl_monitor.c
#	libs/raylib/src/external/glfw/src/wl_platform.h
#	libs/raylib/src/external/glfw/src/wl_window.c
#	libs/raylib/src/external/glfw/src/x11_init.c
#	libs/raylib/src/external/glfw/src/x11_monitor.c
#	libs/raylib/src/external/glfw/src/x11_platform.h
#	libs/raylib/src/external/glfw/src/x11_window.c
#	libs/raylib/src/external/jar_xm.h
#	libs/raylib/src/external/miniaudio.h
#	libs/raylib/src/external/stb_image.h
#	libs/raylib/src/external/stb_image_write.h
#	libs/raylib/src/external/stb_vorbis.h
#	libs/raylib/src/external/tinyobj_loader_c.h
#	libs/raylib/src/gestures.h
#	libs/raylib/src/models.c
#	libs/raylib/src/physac.h
#	libs/raylib/src/raudio.c
#	libs/raylib/src/raudio.h
#	libs/raylib/src/raylib.dll.rc
#	libs/raylib/src/raylib.dll.rc.data
#	libs/raylib/src/raylib.h
#	libs/raylib/src/raylib.rc
#	libs/raylib/src/raylib.rc.data
#	libs/raylib/src/raymath.h
#	libs/raylib/src/rglfw.c
#	libs/raylib/src/rlgl.h
#	libs/raylib/src/rmem.h
#	libs/raylib/src/rnet.h
#	libs/raylib/src/shapes.c
#	libs/raylib/src/text.c
#	libs/raylib/src/textures.c
#	libs/raylib/src/utils.c
#	libs/raylib/src/utils.h

1 files changed, 26 insertions, 0 deletions

diff --git a/libs/raylib/cmake/JoinPaths.cmake b/libs/raylib/cmake/JoinPaths.cmake
new file mode 100644
index 0000000..1de3012
--- /dev/null
+++ b/libs/raylib/cmake/JoinPaths.cmake
@@ -0,0 +1,26 @@
+# This module provides function for joining paths
+# known from most languages
+#
+# Original license:
+# SPDX-License-Identifier: (MIT OR CC0-1.0)
+# Explicit permission given to distribute this module under
+# the terms of the project as described in /LICENSE.rst.
+# Copyright 2020 Jan Tojnar
+# https://github.com/jtojnar/cmake-snips
+#
+# Modelled after Python’s os.path.join
+# https://docs.python.org/3.7/library/os.path.html#os.path.join
+# Windows not supported
+function(join_paths joined_path first_path_segment)
+    set(temp_path "${first_path_segment}")
+    foreach(current_segment IN LISTS ARGN)
+        if(NOT ("${current_segment}" STREQUAL ""))
+            if(IS_ABSOLUTE "${current_segment}")
+                set(temp_path "${current_segment}")
+            else()
+                set(temp_path "${temp_path}/${current_segment}")
+            endif()
+        endif()
+    endforeach()
+    set(${joined_path} "${temp_path}" PARENT_SCOPE)
+endfunction()