UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/raysan5/raylib

Browse source
This commit is contained in:
Ray 2025-03-02 13:43:32 +01:00
commit b99c2848c1
2 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
cmake/raylib-config.cmake
View file

@ -1,6 +1,6 @@
# - Try to find raylib # - Try to find raylib
# Options: # Options:
# raylib_USE_STATIC_LIBS - OFF by default # raylib_USE_STATIC_LIBS - ON by default
# raylib_VERBOSE - OFF by default # raylib_VERBOSE - OFF by default
# Once done, this defines a raylib target that can be passed to # Once done, this defines a raylib target that can be passed to
# target_link_libraries as well as following variables: # target_link_libraries as well as following variables:
@ -11,6 +11,9 @@
# raylib_LDFLAGS - The linker flags needed with raylib # raylib_LDFLAGS - The linker flags needed with raylib
# raylib_DEFINITIONS - Compiler switches required for using raylib # raylib_DEFINITIONS - Compiler switches required for using raylib
option(raylib_USE_STATIC_LIBS "Use static libs" ON)
option(raylib_VERBOSE "Use static libs" OFF)
if (NOT TARGET raylib) if (NOT TARGET raylib)
set(XPREFIX PC_RAYLIB) set(XPREFIX PC_RAYLIB)
@ -25,23 +28,22 @@ if (NOT TARGET raylib)
find_path(raylib_INCLUDE_DIR find_path(raylib_INCLUDE_DIR
NAMES raylib.h NAMES raylib.h
HINTS ${${XPREFIX}_INCLUDE_DIRS} HINTS ${${XPREFIX}_INCLUDE_DIRS} ${raylib_DIR}/../../../include/
) )
set(RAYLIB_NAMES raylib)
if (raylib_USE_STATIC_LIBS) if (raylib_USE_STATIC_LIBS)
set(RAYLIB_NAMES libraylib.a raylib.lib ${RAYLIB_NAMES}) set(RAYLIB_NAMES libraylib.a raylib.lib)
endif() else ()
set(RAYLIB_NAMES raylib)
endif ()
find_library(raylib_LIBRARY find_library(raylib_LIBRARY
NAMES ${RAYLIB_NAMES} NAMES ${RAYLIB_NAMES}
HINTS ${${XPREFIX}_LIBRARY_DIRS} HINTS ${${XPREFIX}_LIBRARY_DIRS} ${raylib_DIR}/../../
) )
set(raylib_LIBRARIES ${raylib_LIBRARY}) set(raylib_LIBRARIES ${raylib_LIBRARY})
set(raylib_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS})
set(raylib_LIBRARY_DIR ${raylib_LIBRARY_DIRS})
set(raylib_INCLUDE_DIRS ${raylib_INCLUDE_DIR}) set(raylib_INCLUDE_DIRS ${raylib_INCLUDE_DIR})
set(raylib_LDFLAGS ${${XPREFIX}_LDFLAGS}) set(raylib_LDFLAGS ${${XPREFIX}_LDFLAGS})

26
src/platforms/rcore_desktop_glfw.c
View file

@ -1521,6 +1521,12 @@ int InitPlatform(void)
SetupFramebuffer(CORE.Window.display.width, CORE.Window.display.height); SetupFramebuffer(CORE.Window.display.width, CORE.Window.display.height);
platform.handle = glfwCreateWindow(CORE.Window.display.width, CORE.Window.display.height, (CORE.Window.title != 0)? CORE.Window.title : " ", monitor, NULL); platform.handle = glfwCreateWindow(CORE.Window.display.width, CORE.Window.display.height, (CORE.Window.title != 0)? CORE.Window.title : " ", monitor, NULL);
if (!platform.handle)
{
glfwTerminate();
TRACELOG(LOG_WARNING, "GLFW: Failed to initialize Window");
return -1;
}
// NOTE: Full-screen change, not working properly... // NOTE: Full-screen change, not working properly...
//glfwSetWindowMonitor(platform.handle, glfwGetPrimaryMonitor(), 0, 0, CORE.Window.screen.width, CORE.Window.screen.height, GLFW_DONT_CARE); //glfwSetWindowMonitor(platform.handle, glfwGetPrimaryMonitor(), 0, 0, CORE.Window.screen.width, CORE.Window.screen.height, GLFW_DONT_CARE);
@ -1535,6 +1541,12 @@ int InitPlatform(void)
int creationHeight = CORE.Window.screen.height != 0 ? CORE.Window.screen.height : 1; int creationHeight = CORE.Window.screen.height != 0 ? CORE.Window.screen.height : 1;
platform.handle = glfwCreateWindow(creationWidth, creationHeight, (CORE.Window.title != 0)? CORE.Window.title : " ", NULL, NULL); platform.handle = glfwCreateWindow(creationWidth, creationHeight, (CORE.Window.title != 0)? CORE.Window.title : " ", NULL, NULL);
if (!platform.handle)
{
glfwTerminate();
TRACELOG(LOG_WARNING, "GLFW: Failed to initialize Window");
return -1;
}
// After the window was created, determine the monitor that the window manager assigned. // After the window was created, determine the monitor that the window manager assigned.
// Derive display sizes, and, if possible, window size in case it was zero at beginning. // Derive display sizes, and, if possible, window size in case it was zero at beginning.
@ -1558,18 +1570,8 @@ int InitPlatform(void)
return -1; return -1;
} }
if (platform.handle) CORE.Window.render.width = CORE.Window.screen.width;
{ CORE.Window.render.height = CORE.Window.screen.height;
CORE.Window.render.width = CORE.Window.screen.width;
CORE.Window.render.height = CORE.Window.screen.height;
}
}
if (!platform.handle)
{
glfwTerminate();
TRACELOG(LOG_WARNING, "GLFW: Failed to initialize Window");
return -1;
} }
glfwMakeContextCurrent(platform.handle); glfwMakeContextCurrent(platform.handle);