add raymedia

Author: GuvaCode

builds_raylib_dev.sh

@@ -16,6 +16,10 @@ sudo apt-get install -y gcc-mingw-w64-i686-posix
 sudo apt-get install -y gcc-mingw-w64-i686-win32
 sudo apt-get install -y build-essential libc6-dev-i386
 sudo apt-get install -y libgl1-mesa-dev:i386
+sudo apt-get install -y libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
+sudo apt-get install -y libavcodec-dev:386 libavformat-dev:386 libavutil-dev:386 libswresample-dev:386 libswscale-dev:386
+
+
 #sudo apt install -y emscripten
     ;;
     * )
@@ -34,6 +38,12 @@ mkdir libs/x86_64-linux
 mkdir libs/x86_32-linux
 mkdir libs/x86_64-win64
 mkdir libs/i386-win32
+
+mkdir libs/x86_64-linux/raymedia
+mkdir libs/x86_32-linux/raymedia
+mkdir libs/x86_64-win64/raymedia
+mkdir libs/i386-win32/raymedia
+
 #mkdir libs/wasm32-wasi
 
 echo -e "\e[92m \e[1m"
@@ -66,6 +76,10 @@ echo "copy raygizmo"
 
 cp headers/extras/ray-gizmo/raygizmo.h raylib_tmp/src/raygizmo.h
 cp headers/extras/ray-gizmo/raygizmo.c raylib_tmp/src/raygizmo.c
+
+cp headers/extras/ray-media/rmedia.h raylib_tmp/src/rmedia.h
+cp headers/extras/ray-media/rmedia.c raylib_tmp/src/rmedia.c
+
 cp headers/Makefile raylib_tmp/src/Makefile
 
 #echo "Download physac "
@@ -80,21 +94,29 @@ echo "Build x86_64_LINUX dynlib"
 echo "#define RAYGUI_IMPLEMENTATION" > raygui.c && echo "#include <extras/raygui.h>" >> raygui.c
 #echo "#define PHYSAC_IMPLEMENTATION" > physac.c && echo "#include <extras/physac.h>" >> physac.c
 echo -e "\e[0m"  
-make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYGIZMO=TRUE
+
+make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYGIZMO=TRUE #RAYLIB_MODULE_RAYMEDIA=TRUE
 
 echo -e "\e[92m \e[1m"
 echo " copy libs x86_64-linux ..."
+
 rm -f ../../libs/x86_64-linux/*
+rm -f ../../libs/x86_64-linux/raymedia/*
 cp libraylib.so.5.5.0 ../../libs/x86_64-linux/libraylib.so
 echo -e "\e[0m"
 
+rm libraylib.so.5.5.0
+make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYMEDIA=TRUE
+
+cp libraylib.so.5.5.0 ../../libs/x86_64-linux/raymedia/libraylib.so.550
+
 echo -e "\e[34m \e[1m"  
 echo "Build x86_64_LINUX Statics ---------------------------------------------" 
 echo -e "\e[0m"
 make clean
 echo "#define RAYGUI_IMPLEMENTATION" > raygui.c && echo "#include <extras/raygui.h>" >> raygui.c
 #echo "#define PHYSAC_IMPLEMENTATION" > physac.c && echo "#include <extras/physac.h>" >> physac.c
-make PLATFORM=PLATFORM_DESKTOP RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYGIZMO=TRUE
+make PLATFORM=PLATFORM_DESKTOP RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYGIZMO=TRUE 
 cp libraylib.a ../../libs/x86_64-linux/libraylib.a
 
 
@@ -106,7 +128,11 @@ echo "#define RAYGUI_IMPLEMENTATION" > raygui.c && echo "#include <extras/raygui
 #echo "#define PHYSAC_IMPLEMENTATION" > physac.c && echo "#include <extras/physac.h>" >> physac.c
 make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYGIZMO=TRUE LDFLAG=-m32
 rm -f ../../libs/x86_32-linux/*
+rm -f ../../libs/x86_64-linux/raymedia/*
 cp libraylib.so.5.5.0 ../../libs/x86_32-linux/libraylib.so
+rm libraylib.so.5.5.0
+make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYGIZMO=TRUE LDFLAG=-m32
+cp libraylib.so.5.5.0 ../../libs/x86_32-linux/raymedia/libraylib.so.550
 
 echo -e "\e[34m \e[1m"  
 echo "Build x86_32_LINUX Statics" 
@@ -143,9 +169,19 @@ echo "#define RAYGUI_IMPLEMENTATION" > raygui.c && echo "#include <extras/raygui
 make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYGIZMO=TRUE OS=Windows_NT CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar 
 
 rm -f ../../libs/x86_64-win64/*
+rm -f ../../libs/x86_64-win64/raymedia/*
+
 cp libraylibdll.a ../../libs/x86_64-win64
 cp raylib.dll ../../libs/x86_64-win64
 
+rm libraylibdll.a
+rm raylib.dll
+
+make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYMEDIA=TRUE OS=Windows_NT CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar 
+
+cp libraylibdll.a ../../libs/x86_64-win64/raymedia
+cp raylib.dll ../../libs/x86_64-win64/raymedia
+
 #---------------------------------------------------------------------------------------------------------
 
 make clean
@@ -161,9 +197,15 @@ echo "#define RAYGUI_IMPLEMENTATION" > raygui.c && echo "#include <extras/raygui
 make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYGIZMO=TRUE OS=Windows_NT CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar
 
 rm -f ../../libs/i386-win32/*
+rm -f ../../libs/i386-win32/raymedia/*
 cp libraylibdll.a ../../libs/i386-win32
 cp raylib.dll ../../libs/i386-win32
 
+rm libraylibdll.a
+rm raylib.dll
+make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED RAYLIB_MODULE_RAYGUI=TRUE RAYLIB_MODULE_RAYMEDIA=TRUE OS=Windows_NT CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar
+
+
 cd ../../
 rm -rvf raylib_tmp
 

examples/shaders/shaders_shadowmap/shaders_shadowmap.lpr

@@ -125,6 +125,7 @@ procedure DrawScene(cube, robot: TModel);
    cube := LoadModelFromMesh(GenMeshCube(1.0, 1.0, 1.0));
    cube.materials[0].shader := shadowShader;
    robot := LoadModel(PChar(GetApplicationDirectory + 'resources/models/robot.glb'));
+
    for i := 0 to robot.materialCount-1 do
    robot.materials[i].shader := shadowShader;
 

headers/Makefile

@@ -103,6 +103,7 @@ RAYLIB_MODULE_AUDIO  ?= TRUE
 RAYLIB_MODULE_MODELS ?= TRUE
 RAYLIB_MODULE_RAYGUI ?= FALSE
 RAYLIB_MODULE_RAYGIZMO ?= FALSE
+RAYLIB_MODULE_RAYMEDIA ?= FALSE
 
 # NOTE: Additional libraries have been moved to their own repos:
 # raygui: https://github.com/raysan5/raygui
@@ -111,6 +112,9 @@ RAYLIB_MODULE_RAYGUI_PATH ?= $(RAYLIB_SRC_PATH)/../../raygui/src
 # raygizmo: https://github.com/cloudofoz/raylib-gizmo/tree/main
 RAYLIB_MODULE_RAYGIZMO_PATH ?= $(RAYLIB_SRC_PATH)
 
+RAYLIB_MODULE_RAYMEDIA_PATH ?= $(RAYLIB_SRC_PATH)
+
+
 # Use external GLFW library instead of rglfw module
 USE_EXTERNAL_GLFW     ?= FALSE
 
@@ -125,6 +129,10 @@ SDL_INCLUDE_PATH      ?= $(RAYLIB_SRC_PATH)/external/SDL2/include
 SDL_LIBRARY_PATH      ?= $(RAYLIB_SRC_PATH)/external/SDL2/lib
 SDL_LIBRARIES         ?= -lSDL2 -lSDL2main
 
+# FFMPEG FOR VIDEO
+FFMPEG_LIBRARIES      ?= -lraylib -lavcodec -lavformat -lavutil -lswresample -lswscale
+
+
 # Determine if the file has root access (only required to install raylib)
 # "whoami" prints the name of the user that calls him (so, if it is the root user, "whoami" prints "root")
 ROOT = $(shell whoami)
@@ -563,8 +571,11 @@ ifeq ($(TARGET_PLATFORM),PLATFORM_DESKTOP_GLFW)
         endif
     endif
     ifeq ($(PLATFORM_OS),LINUX)
-        LDLIBS = -lGL -lc -lm -lpthread -ldl -lrt
-        ifeq ($(GLFW_LINUX_ENABLE_X11),TRUE)
+        LDLIBS = -lGL -lc -lm -lpthread -ldl -lrt 
+       ifeq ($(RAYLIB_MODULE_RAYMEDIA),TRUE)
+        LDLIBS += $(FFMPEG_LIBRARIES)
+       endif
+       ifeq ($(GLFW_LINUX_ENABLE_X11),TRUE)
             LDLIBS += -lX11
         endif
         # TODO: On ARM 32bit arch, miniaudio requires atomics library
@@ -602,7 +613,7 @@ ifeq ($(TARGET_PLATFORM),PLATFORM_DESKTOP_RGFW)
     ifeq ($(PLATFORM_OS),LINUX)
         # Libraries for Debian GNU/Linux desktop compipling
         # NOTE: Required packages: libegl1-mesa-dev
-        LDLIBS = -lGL -lX11 -lXrandr -lXinerama -lXi -lXcursor -lm -lpthread -ldl -lrt
+        LDLIBS = -lGL -lX11 -lXrandr -lXinerama -lXi -lXcursor -lm -lpthread -ldl -lrt 
 
         # Explicit link to libc
         ifeq ($(RAYLIB_LIBTYPE),SHARED)
@@ -655,6 +666,10 @@ ifeq ($(RAYLIB_MODULE_RAYGIZMO),TRUE)
     OBJS += raygizmo.o 
 endif
 
+ifeq ($(RAYLIB_MODULE_RAYMEDIA),TRUE)
+    OBJS += rmedia.o 
+endif
+
 ifeq ($(TARGET_PLATFORM),PLATFORM_ANDROID)
     OBJS += android_native_app_glue.o
 endif
@@ -791,6 +806,19 @@ else
 	@echo "#include \"$(RAYLIB_MODULE_RAYGIZMO_PATH)/raygizmo.h\"" >> raygizmo.c
 endif
 
+# Compile raymedia module
+# NOTE: raumedia header should be distributed with raylib.h
+rmedia.o : rmedia.c
+	$(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS)
+rmedia.c:
+ifeq ($(PLATFORM_SHELL), cmd)
+	@echo #define RAYMEDIA_IMPLEMENTATION > rmedia.c
+	@echo #include "$(RAYLIB_MODULE_RAYMEDIA_PATH)/rmedia.h" >> rmedia.c
+else
+	@echo "#define RAYMEDIA_IMPLEMENTATION" > rmedia.c
+	@echo "#include \"$(RAYLIB_MODULE_RAYGIZMO_PATH)/rmedia.h\"" >> rmedia.c
+endif
+
 # Compile gizmo module
 # raygizmo.o : raygizmo.c raygizmo.h raylib.h rlgl.h raymath.h
 #	$(CC) -c $< $(CFLAGS) $(INCLUDE_PATHS)