aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChrisDill <chrisdude134@gmail.com>2018-09-29 14:28:07 +0100
committerChrisDill <chrisdude134@gmail.com>2018-09-29 14:28:07 +0100
commit6b84b76b70be35b471ef31afc0f0dc4e16cfe383 (patch)
treef3a618776429d4ac5178becf185b368df2e10b39 /src
parented95337eb884baac8de84ae0e973a5ecb0d530e2 (diff)
downloadraylib-6b84b76b70be35b471ef31afc0f0dc4e16cfe383.tar.gz
raylib-6b84b76b70be35b471ef31afc0f0dc4e16cfe383.zip
Forgot #else in platform check
- Added else so return not compiled twice.
Diffstat (limited to 'src')
-rw-r--r--src/core.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/core.c b/src/core.c
index 65c18fec..e370d5e3 100644
--- a/src/core.c
+++ b/src/core.c
@@ -777,8 +777,9 @@ int GetMonitorCount(void)
int monitorCount;
glfwGetMonitors(&monitorCount);
return monitorCount;
-#endif
+#else
return 1;
+#endif
}
// Get primary monitor width
@@ -788,8 +789,9 @@ int GetMonitorWidth(void)
GLFWmonitor *monitor = glfwGetPrimaryMonitor();
const GLFWvidmode * mode = glfwGetVideoMode(monitor);
return mode->width;
-#endif
+#else
return GetScreenWidth();
+#endif
}
// Get primary monitor height
@@ -799,8 +801,9 @@ int GetMonitorHeight(void)
GLFWmonitor *monitor = glfwGetPrimaryMonitor();
const GLFWvidmode * mode = glfwGetVideoMode(monitor);
return mode->height;
-#endif
+#else
return GetScreenHeight();
+#endif
}
// Get primary montior physical width in millimetres
@@ -811,8 +814,9 @@ int GetMonitorPhysicalWidth(void)
GLFWmonitor *monitor = glfwGetPrimaryMonitor();
glfwGetMonitorPhysicalSize(monitor, &physicalWidth, NULL);
return physicalWidth;
-#endif
+#else
return 0;
+#endif
}
// Get primary monitor physical height in millimetres
@@ -823,8 +827,9 @@ int GetMonitorPhysicalHeight(void)
GLFWmonitor *monitor = glfwGetPrimaryMonitor();
glfwGetMonitorPhysicalSize(monitor, NULL, &physicalHeight);
return physicalHeight;
-#endif
+#else
return 0;
+#endif
}
// Get the human-readable, UTF-8 encoded name of the primary monitor
@@ -833,8 +838,9 @@ const char *GetMonitorName(void)
#if defined(PLATFORM_DESKTOP)
GLFWmonitor *monitor = glfwGetPrimaryMonitor();
return glfwGetMonitorName(monitor);
-#endif
+#else
return "";
+#endif
}
// Show mouse cursor