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-monitor

Browse Source 
Conflicts:
	src/CMakeLists.txt
	src/fullscreen.c
This commit is contained in:
Camilla Berglund
2012-09-12 21:42:21 +02:00
parent 4bcb1b38f9 4408d2134c
commit 1071966d55
8 changed files with 26 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+1 -1
View File
@@ -22,7 +22,7 @@ elseif (_GLFW_WIN32_WGL)
set(glfw_HEADERS ${common_HEADERS} win32_platform.h)
set(glfw_SOURCES ${common_SOURCES} win32_clipboard.c win32_gamma.c
win32_init.c win32_input.c win32_joystick.c win32_monitor.c
win32_opengl.c win32_time.c win32_window.c win32_dllmain.c)
win32_opengl.c win32_time.c win32_window.c)
if (GLFW_NATIVE_API)
list(APPEND glfw_SOURCES win32_native.c)