mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-10-15 14:26:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "REVIEWED: PLATFORM_DESKTOP Windows building"

Browse Source 
This reverts commit 71a12171f7.
This commit is contained in:
Ray
2023-09-20 11:14:08 +02:00
parent 71a12171f7
commit e3c697946a
7 changed files with 278 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rcore_desktop.c
View File

@@ -1173,22 +1173,19 @@ void *GetWindowHandle(void)
// Get number of monitors
int GetMonitorCount(void)
{
int monitorCount = 0;
int monitorCount;
glfwGetMonitors(&monitorCount);
return monitorCount;
}
// Get number of monitors
int GetCurrentMonitor(void)
{
int index = 0;
int monitorCount = 0;
int monitorCount;
GLFWmonitor **monitors = glfwGetMonitors(&monitorCount);
GLFWmonitor *monitor = NULL;
if (monitorCount >= 1)
if (monitorCount > 1)
{
if (IsWindowFullscreen())
{
@@ -1219,7 +1216,6 @@ int GetCurrentMonitor(void)
monitor = monitors[i];
glfwGetMonitorPos(monitor, &mx, &my);
const GLFWvidmode *mode = glfwGetVideoMode(monitor);
if (mode)
{
const int width = mode->width;
@@ -1238,8 +1234,6 @@ int GetCurrentMonitor(void)
}
}
}
return index;
}
// Get selected monitor position
@@ -1262,7 +1256,7 @@ Vector2 GetMonitorPosition(int monitor)
// Get selected monitor width (currently used by monitor)
int GetMonitorWidth(int monitor)
{
int monitorCount = 0;
int monitorCount;
GLFWmonitor **monitors = glfwGetMonitors(&monitorCount);
if ((monitor >= 0) && (monitor < monitorCount))
@@ -1273,7 +1267,6 @@ int GetMonitorWidth(int monitor)
else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor");
}
else TRACELOG(LOG_WARNING, "GLFW: Failed to find selected monitor");
return 0;
}