From 413d059fd894c62a3209eff259d42e4ba37f950f Mon Sep 17 00:00:00 2001 From: Ray Date: Fri, 19 May 2017 00:55:02 +0200 Subject: Some tweaks and additions --- examples/Makefile | 6 +++--- examples/others/audio_standalone.c | 12 +++++++----- examples/others/resources/audio/guitar_noodling.ogg | Bin 0 -> 506938 bytes examples/others/resources/audio/tanatana.ogg | Bin 0 -> 57328 bytes examples/others/resources/audio/weird.wav | Bin 0 -> 6246 bytes examples/others/rlgl_standalone.c | 11 ++++++----- 6 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 examples/others/resources/audio/guitar_noodling.ogg create mode 100644 examples/others/resources/audio/tanatana.ogg create mode 100644 examples/others/resources/audio/weird.wav (limited to 'examples') diff --git a/examples/Makefile b/examples/Makefile index 969edd0c..cde8ca9a 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -30,6 +30,9 @@ # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() PLATFORM ?= PLATFORM_DESKTOP +# define raylib directory for include and library +RAYLIB_PATH ?= C:\raylib\raylib + # define NO to use OpenAL Soft as static library (shared by default) SHARED_OPENAL ?= NO @@ -37,9 +40,6 @@ ifeq ($(PLATFORM),PLATFORM_WEB) SHARED_OPENAL = NO endif -# define raylib directory for include and library -RAYLIB_PATH ?= C:\raylib\raylib - # determine PLATFORM_OS in case PLATFORM_DESKTOP selected ifeq ($(PLATFORM),PLATFORM_DESKTOP) # No uname.exe on MinGW!, but OS=Windows_NT on Windows! ifeq ($(UNAME),Msys) -> Windows diff --git a/examples/others/audio_standalone.c b/examples/others/audio_standalone.c index 3edf8895..6d7fe1f0 100644 --- a/examples/others/audio_standalone.c +++ b/examples/others/audio_standalone.c @@ -11,22 +11,24 @@ * jar_mod - MOD audio file loading * * Compile audio module using: -* gcc -c audio.c stb_vorbis.c -Wall -std=c99 -DAUDIO_STANDALONE +* gcc -c audio.c stb_vorbis.c -Wall -std=c99 -DAUDIO_STANDALONE -DAL_LIBTYPE_STATIC * * Compile example using: -* gcc -o $(NAME_PART).exe $(FILE_NAME) audio.o stb_vorbis.o -lopenal32 -std=c99 +* gcc -o audio_standalone.exe audio_standalone.c audio.o stb_vorbis.o -lopenal32 -lwinmm / +* -Wall -std=c99 -Wl,-allow-multiple-definition * -* This example has been created using raylib 1.5 (www.raylib.com) +* This example has been created using raylib 1.7 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Copyright (c) 2015 Ramon Santamaria (@raysan5) +* Copyright (c) 2017 Ramon Santamaria (@raysan5) * ********************************************************************************************/ #include #if defined(_WIN32) -#include // Windows only, no stardard library +#include // Windows only, no stardard library #endif + #include "audio.h" #if defined(__linux__) diff --git a/examples/others/resources/audio/guitar_noodling.ogg b/examples/others/resources/audio/guitar_noodling.ogg new file mode 100644 index 00000000..f5022040 Binary files /dev/null and b/examples/others/resources/audio/guitar_noodling.ogg differ diff --git a/examples/others/resources/audio/tanatana.ogg b/examples/others/resources/audio/tanatana.ogg new file mode 100644 index 00000000..90b1795a Binary files /dev/null and b/examples/others/resources/audio/tanatana.ogg differ diff --git a/examples/others/resources/audio/weird.wav b/examples/others/resources/audio/weird.wav new file mode 100644 index 00000000..101029c5 Binary files /dev/null and b/examples/others/resources/audio/weird.wav differ diff --git a/examples/others/rlgl_standalone.c b/examples/others/rlgl_standalone.c index be0cfc52..8ae32f36 100644 --- a/examples/others/rlgl_standalone.c +++ b/examples/others/rlgl_standalone.c @@ -6,21 +6,22 @@ * OpenGL 1.1 does not support shaders but it can also be used. * * Compile rlgl module using: -* gcc -c rlgl.c -Wall -std=c99 -DRLGL_STANDALONE -DRAYMATH_IMPLEMENTATION -DGRAPHICS_API_OPENGL_33 +* gcc -c $(RAYLIB_DIR)\raylib\src\rlgl.c -DRLGL_STANDALONE -DRAYMATH_IMPLEMENTATION -DGRAPHICS_API_OPENGL_33 / +* -I$(RAYLIB_DIR)\raylib\src\external -Wall -std=c99 * * NOTE: rlgl module requires the following header-only files: * external/glad.h - OpenGL extensions loader (stripped to only required extensions) -* shader_standard.h - Standard shader for materials and lighting * shader_distortion.h - Distortion shader for VR * raymath.h - Vector and matrix math functions * * Compile example using: -* gcc -o rlgl_standalone.exe rlgl_standalone.c rlgl.o -lglfw3 -lopengl32 -lgdi32 -std=c99 +* gcc -o rlgl_standalone.exe rlgl_standalone.c rlgl.o -s $(RAYLIB_DIR)\raylib\raylib_icon -I$(RAYLIB_DIR)\raylib\src / +* -L. -L$(RAYLIB_DIR)\raylib\src -lglfw3 -lopengl32 -lgdi32 -Wall -std=c99 * -* This example has been created using raylib 1.5 (www.raylib.com) +* This example has been created using raylib 1.7 (www.raylib.com) * raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) * -* Copyright (c) 2015 Ramon Santamaria (@raysan5) +* Copyright (c) 2017 Ramon Santamaria (@raysan5) * ********************************************************************************************/ -- cgit v1.2.3