Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-18 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-display-support

Browse Source 
Conflicts:
	src/fullscreen.c
	src/win32_window.c
	src/x11_fullscreen.c
This commit is contained in:
Marcel Metz
2011-10-07 00:35:37 -04:00
parent 719962817e 970269cf3a
commit ac57be060d
11 changed files with 97 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/internal.h
+4
View File
@@ -59,6 +59,10 @@
#include "config.h"
#include "../include/GL/glfw3.h"
// This path may need to be changed if you build GLFW using your own setup
// We ship and use our own copy of glext.h since GLFW uses fairly new
// extensions and not all operating systems come with an up-to-date version
#include "../support/GL/glext.h"
#if defined(_GLFW_COCOA_NSGL)