diff options
| -rw-r--r-- | CONTRIBUTING.md | 1 | ||||
| -rw-r--r-- | examples/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | examples/shaders/shaders_raymarching.c | 2 | ||||
| -rw-r--r-- | raylib.pc.in | 4 | ||||
| -rw-r--r-- | src/raudio.c | 11 | ||||
| -rw-r--r-- | src/raudio.h | 11 | ||||
| -rw-r--r-- | src/raylib.h | 1 |
7 files changed, 22 insertions, 20 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2cad76fc..68e529bc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,7 +71,6 @@ Some people ported raylib to other languages in form of bindings or wrappers to - [RaylibSharp](https://github.com/TheLumaio/RaylibSharp) : raylib **C#** binding - [raylib-ruby-ffi](https://github.com/D3nX/raylib-ruby-ffi) : raylib **Ruby** binding - [raylib-rs](https://github.com/deltaphc/raylib-rs) : raylib **Rust** binding - - [raylib-rust](https://github.com/dtcristo/raylib-rust) : raylib **Rust** binding - [raylib-py](https://github.com/overdev/raylib-py) : raylib **Python** binding - [raylib-haskell](https://github.com/DevJac/raylib-haskell) : raylib **Haskell** binding - [raylib-java](https://github.com/XoanaIO/raylib-java) : raylib **Java** binding diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 1d4fdd79..4b04d45a 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -56,7 +56,10 @@ if(${PLATFORM} MATCHES "Android") elseif(${PLATFORM} MATCHES "Web") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s EMTERPRETIFY=1 -s EMTERPRETIFY_ASYNC=1") + # Since WASM is used, ALLOW_MEMORY_GROWTH has no extra overheads + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s ALLOW_MEMORY_GROWTH=1 --no-heap-copy") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --shell-file ${CMAKE_SOURCE_DIR}/templates/web_shell/shell.html") + set(OUTPUT_EXT ".html") endif() @@ -77,6 +80,15 @@ foreach(example_source ${example_sources}) add_executable(${example_name} ${example_source}) target_link_libraries(${example_name} raylib) + + string(REGEX MATCH ".*/.*/" resources_dir ${example_source}) + string(APPEND resources_dir "resources") + + if(${PLATFORM} MATCHES "Web" AND EXISTS ${resources_dir}) + # The local resources path needs to be mapped to /resources virtual path + string(APPEND resources_dir "@resources") + set_target_properties(${example_name} PROPERTIES LINK_FLAGS "--preload-file ${resources_dir}") + endif() endforeach() if (${PLATFORM} MATCHES "Desktop") diff --git a/examples/shaders/shaders_raymarching.c b/examples/shaders/shaders_raymarching.c index 79868a2a..e5c58a1d 100644 --- a/examples/shaders/shaders_raymarching.c +++ b/examples/shaders/shaders_raymarching.c @@ -25,7 +25,7 @@ int main() int screenWidth = 800; int screenHeight = 450; - InitWindow(screenWidth, screenHeight, "raymarching"); + InitWindow(screenWidth, screenHeight, "raylib [shaders] example - raymarching shapes"); Camera camera = { 0 }; camera.position = (Vector3){ 2.5f, 2.5f, 3.0f }; // Camera position diff --git a/raylib.pc.in b/raylib.pc.in index 837b2d9a..fe3a3df5 100644 --- a/raylib.pc.in +++ b/raylib.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include +libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ Name: raylib Description: Simple and easy-to-use library to enjoy videogames programming diff --git a/src/raudio.c b/src/raudio.c index 3874becf..1194e76a 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -1,6 +1,6 @@ /********************************************************************************************** * -* raylib.audio - Basic funtionality to work with audio +* raudio - A simple and easy-to-use audio library based on mini_al * * FEATURES: * - Manage audio device (init/close) @@ -25,18 +25,13 @@ * Selected desired fileformats to be supported for loading. Some of those formats are * supported by default, to remove support, just comment unrequired #define in this module * -* LIMITATIONS (only OpenAL Soft): -* Only up to two channels supported: MONO and STEREO (for additional channels, use AL_EXT_MCFORMATS) -* Only the following sample sizes supported: 8bit PCM, 16bit PCM, 32-bit float PCM (using AL_EXT_FLOAT32) -* * DEPENDENCIES: * mini_al - Audio device/context management (https://github.com/dr-soft/mini_al) * stb_vorbis - OGG audio files loading (http://www.nothings.org/stb_vorbis/) * jar_xm - XM module file loading * jar_mod - MOD audio file loading * dr_flac - FLAC audio file loading -* -* *OpenAL Soft - Audio device management, still used on HTML5 and OSX platforms +* dr_mp3 - MP3 audio file loading * * CONTRIBUTORS: * David Reid (github: @mackron) (Nov. 2017): @@ -51,7 +46,7 @@ * * LICENSE: zlib/libpng * -* Copyright (c) 2014-2018 Ramon Santamaria (@raysan5) +* Copyright (c) 2014-2019 Ramon Santamaria (@raysan5) * * This software is provided "as-is", without any express or implied warranty. In no event * will the authors be held liable for any damages arising from the use of this software. diff --git a/src/raudio.h b/src/raudio.h index 01c93741..24669d76 100644 --- a/src/raudio.h +++ b/src/raudio.h @@ -1,6 +1,6 @@ /********************************************************************************************** * -* raylib.audio - Basic funtionality to work with audio +* raudio - A simple and easy-to-use audio library based on mini_al * * FEATURES: * - Manage audio device (init/close) @@ -10,18 +10,13 @@ * - Manage mixing channels * - Manage raw audio context * -* LIMITATIONS (only OpenAL Soft): -* Only up to two channels supported: MONO and STEREO (for additional channels, use AL_EXT_MCFORMATS) -* Only the following sample sizes supported: 8bit PCM, 16bit PCM, 32-bit float PCM (using AL_EXT_FLOAT32) -* * DEPENDENCIES: * mini_al - Audio device/context management (https://github.com/dr-soft/mini_al) * stb_vorbis - OGG audio files loading (http://www.nothings.org/stb_vorbis/) * jar_xm - XM module file loading * jar_mod - MOD audio file loading * dr_flac - FLAC audio file loading -* -* *OpenAL Soft - Audio device management, still used on HTML5 and OSX platforms +* dr_mp3 - MP3 audio file loading * * CONTRIBUTORS: * David Reid (github: @mackron) (Nov. 2017): @@ -36,7 +31,7 @@ * * LICENSE: zlib/libpng * -* Copyright (c) 2014-2018 Ramon Santamaria (@raysan5) +* Copyright (c) 2014-2019 Ramon Santamaria (@raysan5) * * This software is provided "as-is", without any express or implied warranty. In no event * will the authors be held liable for any damages arising from the use of this software. diff --git a/src/raylib.h b/src/raylib.h index 739199ba..11fe145b 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -139,6 +139,7 @@ // deprecated raylib implementation of these functions #define FormatText TextFormat #define SubText TextSubtext +#define ShowWindow UnhideWindow //---------------------------------------------------------------------------------- // Structures Definition |