Merge branch 'master' into flag-macros

Author: JohnnyCena123

.github/workflows/parse_api.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Diff parse files
         id: diff
         run: |
-          git add -N parser
+          git add -N tools/parser
           git diff --name-only --exit-code
         continue-on-error: true
 

CMakeLists.txt

@@ -29,9 +29,9 @@ include(CompilerFlags)
 # Registers build options that are exposed to cmake
 include(CMakeOptions.txt)
 
-if (UNIX AND NOT APPLE AND NOT "${PLATFORM}" MATCHES "DRM")
+if (UNIX AND NOT APPLE AND NOT "${PLATFORM}" MATCHES "DRM" AND NOT "${PLATFORM}" MATCHES "Web")
   if (NOT GLFW_BUILD_WAYLAND AND NOT GLFW_BUILD_X11)
-    MESSAGE(FATAL_ERROR "Cannot disable both Wayland and X11")
+    message(FATAL_ERROR "Cannot disable both Wayland and X11")
   endif()
 endif()
 
@@ -51,7 +51,7 @@ if(NOT TARGET uninstall AND PROJECT_IS_TOP_LEVEL)
 endif()
 
 if (${BUILD_EXAMPLES})
-  MESSAGE(STATUS "Building examples is enabled")
+  message(STATUS "Building examples is enabled")
   add_subdirectory(examples)
 endif()
 

CONTRIBUTING.md

@@ -69,8 +69,8 @@ If you have any doubt, don't hesitate to [contact me](mailto:[email protected])!.
 You can write me a direct mail but you can also contact me on the following networks:
 
  - [raylib Discord](https://discord.gg/raylib) - A direct communication channel for project discussions.
- - [raylib twitter](https://twitter.com/raysan5) - My personal twitter account, I usually post about raylib, you can send me PMs.
  - [raylib reddit](https://www.reddit.com/r/raylib/) - A good place for discussions or to ask for help.
  - [raylib web](http://www.raylib.com/) - On top-right corner there is a bunch of networks where you can find me.
+ - [raylib X](https://x.com/raysan5) - My personal X account, I usually post about raylib, you can send me PMs.
 
 Thank you very much for your time! :)

README.md

@@ -129,7 +129,7 @@ raylib is present in several networks and raylib community is growing everyday.
 
  - Webpage: [https://www.raylib.com](https://www.raylib.com)
  - Discord: [https://discord.gg/raylib](https://discord.gg/raylib)
- - Twitter: [https://www.twitter.com/raysan5](https://www.twitter.com/raysan5)
+ - X: [https://x.com/raysan5](https://x.com/raysan5)
  - BlueSky: [https://bsky.app/profile/raysan5](https://bsky.app/profile/raysan5.bsky.social)
  - Twitch:  [https://www.twitch.tv/raysan5](https://www.twitch.tv/raysan5)
  - Reddit:  [https://www.reddit.com/r/raylib](https://www.reddit.com/r/raylib)

cmake/InstallConfigurations.cmake

@@ -19,9 +19,18 @@ join_paths(libdir_for_pc_file "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}")
 join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
 configure_file(../raylib.pc.in raylib.pc @ONLY)
 configure_file(../cmake/raylib-config-version.cmake raylib-config-version.cmake @ONLY)
+configure_file(../cmake/raylib-config.cmake raylib-config.cmake @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/raylib.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/raylib-config-version.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/raylib")
-install(FILES ${PROJECT_SOURCE_DIR}/../cmake/raylib-config.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/raylib")
+install(FILES
+        "${CMAKE_CURRENT_BINARY_DIR}/raylib-config-version.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/raylib-config.cmake"
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/raylib
+)
+install(EXPORT raylib-targets
+        FILE raylib-targets.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/raylib
+)
 
 # populates raylib_{FOUND, INCLUDE_DIRS, LIBRARIES, LDFLAGS, DEFINITIONS}
 include(PopulateConfigVariablesLocally)

cmake/LibraryConfigurations.cmake

@@ -7,6 +7,8 @@ if(POLICY CMP0072)
   cmake_policy(SET CMP0072 NEW)
 endif()
 
+set(RAYLIB_DEPENDENCIES "include(CMakeFindDependencyMacro)")
+
 if (${PLATFORM} MATCHES "Desktop")
     set(PLATFORM_CPP "PLATFORM_DESKTOP")
 
@@ -36,19 +38,22 @@ if (${PLATFORM} MATCHES "Desktop")
             find_library(OSS_LIBRARY ossaudio)
         endif ()
 
-        set(LIBS_PRIVATE m pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
+        set(LIBS_PRIVATE pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
+        set(LIBS_PUBLIC m)
     else ()
         find_library(pthread NAMES pthread)
         find_package(OpenGL QUIET)
         if ("${OPENGL_LIBRARIES}" STREQUAL "")
             set(OPENGL_LIBRARIES "GL")
         endif ()
 
-        set(LIBS_PRIVATE m atomic pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
+        set(LIBS_PRIVATE pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
+        set(LIBS_PUBLIC m)
 
         if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Net|Open)BSD")
             find_library(OSS_LIBRARY ossaudio)
-            set(LIBS_PRIVATE m pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY})
+        else ()
+            set(LIBS_PRIVATE ${LIBS_PRIVATE} atomic)
         endif ()
 
         if (NOT "${CMAKE_SYSTEM_NAME}" MATCHES "(Net|Open)BSD" AND USE_AUDIO)
@@ -80,7 +85,8 @@ elseif (${PLATFORM} MATCHES "Android")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs,libatomic.a -Wl,--build-id -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel -Wl,--fatal-warnings -u ANativeActivity_onCreate -Wl,-undefined,dynamic_lookup")
 
     find_library(OPENGL_LIBRARY OpenGL)
-    set(LIBS_PRIVATE m log android EGL GLESv2 OpenSLES atomic c)
+    set(LIBS_PRIVATE log android EGL GLESv2 OpenSLES atomic c)
+    set(LIBS_PUBLIC m)
 
 elseif ("${PLATFORM}" MATCHES "DRM")
     set(PLATFORM_CPP "PLATFORM_DRM")
@@ -98,7 +104,8 @@ elseif ("${PLATFORM}" MATCHES "DRM")
     if (NOT CMAKE_CROSSCOMPILING OR NOT CMAKE_SYSROOT)
         include_directories(/usr/include/libdrm)
     endif ()
-    set(LIBS_PRIVATE ${GLESV2} ${EGL} ${DRM} ${GBM} atomic pthread m dl)
+    set(LIBS_PRIVATE ${GLESV2} ${EGL} ${DRM} ${GBM} atomic pthread dl)
+    set(LIBS_PUBLIC m)
 
 elseif ("${PLATFORM}" MATCHES "SDL")
 	# First, check if SDL is included as a subdirectory
@@ -120,15 +127,17 @@ elseif ("${PLATFORM}" MATCHES "SDL")
 		find_package(SDL3 QUIET)
 		if(SDL3_FOUND)
 			message(STATUS "Found SDL3 via find_package()")
+			set(LIBS_PUBLIC SDL3::SDL3)
+			set(RAYLIB_DEPENDENCIES "${RAYLIB_DEPENDENCIES}\nfind_dependency(SDL3 REQUIRED)")
 			set(PLATFORM_CPP "PLATFORM_DESKTOP_SDL")
-			set(LIBS_PRIVATE SDL3::SDL3)
 			add_compile_definitions(USING_SDL3_PACKAGE)
 		else()
 			# Fallback to SDL2
 			find_package(SDL2 REQUIRED)
 			message(STATUS "Found SDL2 via find_package()")
 			set(PLATFORM_CPP "PLATFORM_DESKTOP_SDL")
-			set(LIBS_PRIVATE SDL2::SDL2)
+			set(LIBS_PUBLIC SDL2::SDL2)
+			set(RAYLIB_DEPENDENCIES "${RAYLIB_DEPENDENCIES}\nfind_dependency(SDL3 REQUIRED)")
 			add_compile_definitions(USING_SDL2_PACKAGE)
 		endif()
 	endif()	

cmake/raylib-config.cmake

@@ -1,81 +1,4 @@
-# - Try to find raylib
-# Options:
-#   raylib_USE_STATIC_LIBS - ON by default
-#   raylib_VERBOSE         - OFF by default
-# Once done, this defines a raylib target that can be passed to
-# target_link_libraries as well as following variables:
-#
-#   raylib_FOUND - System has raylib installed
-#   raylib_INCLUDE_DIRS - The include directories for the raylib header(s)
-#   raylib_LIBRARIES - The libraries needed to use raylib
-#   raylib_LDFLAGS - The linker flags needed with raylib
-#   raylib_DEFINITIONS - Compiler switches required for using raylib
+@PACKAGE_INIT@
+@RAYLIB_DEPENDENCIES@
 
-option(raylib_USE_STATIC_LIBS "Use static libs" ON)
-option(raylib_VERBOSE "Show raylib verbose messages" OFF)
-
-if (NOT TARGET raylib)
-    set(XPREFIX PC_RAYLIB)
-
-    find_package(PkgConfig QUIET)
-    pkg_check_modules(${XPREFIX} QUIET raylib)
-
-    if (raylib_USE_STATIC_LIBS)
-        set(XPREFIX ${XPREFIX}_STATIC)
-    endif()
-
-    set(raylib_DEFINITIONS ${${XPREFIX}_CFLAGS})
-
-    find_path(raylib_INCLUDE_DIR
-        NAMES raylib.h
-        HINTS ${${XPREFIX}_INCLUDE_DIRS} ${raylib_DIR}/../../../include/
-    )
-
-
-    if (raylib_USE_STATIC_LIBS)
-        set(RAYLIB_NAMES libraylib.a raylib.lib)
-    else ()
-        set(RAYLIB_NAMES raylib)
-    endif ()
-
-    find_library(raylib_LIBRARY
-        NAMES ${RAYLIB_NAMES}
-        HINTS ${${XPREFIX}_LIBRARY_DIRS} ${raylib_DIR}/../../
-    )
-
-    set(raylib_LIBRARIES    ${raylib_LIBRARY})
-    set(raylib_INCLUDE_DIRS ${raylib_INCLUDE_DIR})
-    set(raylib_LDFLAGS      ${${XPREFIX}_LDFLAGS})
-
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(raylib DEFAULT_MSG
-        raylib_LIBRARY
-        raylib_INCLUDE_DIR
-    )
-
-    mark_as_advanced(raylib_LIBRARY raylib_INCLUDE_DIR)
-
-    if (raylib_USE_STATIC_LIBS)
-      add_library(raylib STATIC IMPORTED GLOBAL)
-    else()
-      add_library(raylib SHARED IMPORTED GLOBAL)
-    endif()
-    string (REPLACE ";" " " raylib_LDFLAGS "${raylib_LDFLAGS}")
-
-    set_target_properties(raylib
-      PROPERTIES
-      IMPORTED_LOCATION             "${raylib_LIBRARIES}"
-      IMPORTED_IMPLIB               "${raylib_LIBRARIES}"
-      INTERFACE_INCLUDE_DIRECTORIES "${raylib_INCLUDE_DIRS}"
-      INTERFACE_LINK_LIBRARIES      "${raylib_LDFLAGS}"
-      INTERFACE_COMPILE_OPTIONS     "${raylib_DEFINITIONS}"
-    )
-
-    if (raylib_VERBOSE)
-      message(STATUS "raylib_FOUND: ${raylib_FOUND}")
-      message(STATUS "raylib_INCLUDE_DIRS: ${raylib_INCLUDE_DIRS}")
-      message(STATUS "raylib_LIBRARIES: ${raylib_LIBRARIES}")
-      message(STATUS "raylib_LDFLAGS: ${raylib_LDFLAGS}")
-      message(STATUS "raylib_DEFINITIONS: ${raylib_DEFINITIONS}")
-    endif()
-endif()
+include("${CMAKE_CURRENT_LIST_DIR}/raylib-targets.cmake")

examples/CMakeLists.txt

@@ -97,17 +97,9 @@ if (${PLATFORM} MATCHES "Android")
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/shaders/shaders_basic_lighting.c)
 
 elseif (${PLATFORM} MATCHES "Web")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os")
-    # Since WASM is used, ALLOW_MEMORY_GROWTH has no extra overheads
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s WASM=1 -s ASYNCIFY -s ALLOW_MEMORY_GROWTH=1 --shell-file ${CMAKE_SOURCE_DIR}/src/shell.html")
-    set(CMAKE_EXECUTABLE_SUFFIX ".html")
-
-    list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/raylib_opengl_interop.c)
-
-    # Remove the -rdynamic flag because otherwise emscripten
-    # does not generate HTML+JS+WASM files, only a non-working
-    # and fat HTML
-    string(REPLACE "-rdynamic" "" CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}")
+    set(example_sources) # clear example_sources
+    list(APPEND example_sources others/web_basic_window.c)
+    list(APPEND example_sources core/core_input_gestures_testbed.c)
 
 elseif ("${PLATFORM}" STREQUAL "DRM")
     list(REMOVE_ITEM example_sources ${CMAKE_CURRENT_SOURCE_DIR}/others/rlgl_standalone.c)
@@ -165,10 +157,34 @@ foreach (example_source ${example_sources})
     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}")
+    if (${PLATFORM} MATCHES "Web")
+        target_compile_options(${example_name} PRIVATE -Os)
+        target_link_options(${example_name} PRIVATE
+            -sALLOW_MEMORY_GROWTH=1
+            -sEXPORTED_RUNTIME_METHODS=[requestFullscreen]
+            -sUSE_GLFW=3
+            --shell-file "${CMAKE_SOURCE_DIR}/src/shell.html"
+        )
+        set_target_properties(${example_name} PROPERTIES SUFFIX ".html")
+
+        if (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 ()
+
+        if(${GRAPHICS} MATCHES "GRAPHICS_API_OPENGL_ES3")
+            target_link_options(${example_name} PUBLIC "-sMIN_WEBGL_VERSION=2")
+            target_link_options(${example_name} PUBLIC "-sMAX_WEBGL_VERSION=2")
+        endif()
+
+        # Checks if OSX and links appropriate frameworks (Only required on MacOS)
+        if (APPLE)
+            target_link_libraries(${example_name} "-framework IOKit")
+            target_link_libraries(${example_name} "-framework Cocoa")
+            target_link_libraries(${example_name} "-framework OpenGL")
+        endif()
+
     endif ()
 endforeach ()