Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-23 00:59:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into EGL

Browse Source 
Conflicts:
	CMakeLists.txt
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/cocoa_window.m
	src/config.h.in
	src/glx_opengl.c
	src/internal.h
	src/opengl.c
	src/window.c
	tests/glfwinfo.c
This commit is contained in:
Camilla Berglund
2012-11-27 12:14:54 +01:00
parent 9d6945a766 fc69721807
commit e4ddcefc14
50 changed files with 1569 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-8
View File
@@ -218,10 +218,6 @@ if (_GLFW_X11_GLX)
endif()
endif()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(_GLFW_HAS_LINUX_JOYSTICKS 1)
endif()
endif()
#--------------------------------------------------------------------
@@ -266,10 +262,6 @@ if (_GLFW_X11_EGL)
endif()
endif()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(_GLFW_HAS_LINUX_JOYSTICKS 1)
endif()
endif()
#--------------------------------------------------------------------