gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 04:28:52 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'multi-monitor' of github.com:elmindreda/glfw into multi-monitor

Browse Source
This commit is contained in:
Camilla Berglund 2012-07-20 01:05:57 +02:00
parent f559b217af bd630c4e83
commit f4880b9206
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/internal.h Normal file → Executable file
View File

@ -60,6 +60,7 @@ typedef struct _GLFWwndconfig _GLFWwndconfig;
typedef struct _GLFWfbconfig _GLFWfbconfig; typedef struct _GLFWfbconfig _GLFWfbconfig;
typedef struct _GLFWwindow _GLFWwindow; typedef struct _GLFWwindow _GLFWwindow;
typedef struct _GLFWlibrary _GLFWlibrary; typedef struct _GLFWlibrary _GLFWlibrary;
typedef struct _GLFWmonitor _GLFWmonitor;
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@ -76,13 +77,6 @@ typedef struct _GLFWlibrary _GLFWlibrary;
// extensions and not all operating systems come with an up-to-date version // extensions and not all operating systems come with an up-to-date version
#include "../support/GL/glext.h" #include "../support/GL/glext.h"
typedef struct _GLFWhints _GLFWhints;
typedef struct _GLFWwndconfig _GLFWwndconfig;
typedef struct _GLFWfbconfig _GLFWfbconfig;
typedef struct _GLFWwindow _GLFWwindow;
typedef struct _GLFWlibrary _GLFWlibrary;
typedef struct _GLFWmonitor _GLFWmonitor;
#if defined(_GLFW_COCOA_NSGL) #if defined(_GLFW_COCOA_NSGL)
#include "cocoa_platform.h" #include "cocoa_platform.h"
#elif defined(_GLFW_WIN32_WGL) #elif defined(_GLFW_WIN32_WGL)

2
tests/modes.c Normal file → Executable file
View File

@ -154,7 +154,7 @@ static void test_modes(GLFWmonitor monitor)
glfwOpenWindowHint(GLFW_GREEN_BITS, mode->greenBits); glfwOpenWindowHint(GLFW_GREEN_BITS, mode->greenBits);
glfwOpenWindowHint(GLFW_BLUE_BITS, mode->blueBits); glfwOpenWindowHint(GLFW_BLUE_BITS, mode->blueBits);
printf("Testing mode %u on monitor %s: %s", printf("Testing mode %u on monitor %s: %s\n",
(unsigned int) i, (unsigned int) i,
glfwGetMonitorString(monitor, GLFW_MONITOR_NAME), glfwGetMonitorString(monitor, GLFW_MONITOR_NAME),
format_mode(mode)); format_mode(mode));