Commit Graph

138 Commits

Author SHA1 Message Date
Camilla Berglund
1a05d6db70 Renamed GLX implementation file. 2012-07-20 02:10:39 +02:00
Cloudef
28db982d0a Add x11_fullscreen.c to the source list 2012-07-17 22:25:47 +03:00
Cloudef
1327c124a4 Seperate Context from Window in CMakeLists, add option to build for EGL 2012-07-17 22:25:47 +03:00
Camilla Berglund
c06f838d88 Merge branch 'master' into multi-monitor
Conflicts:
	.gitignore
	examples/CMakeLists.txt
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/internal.h
	src/win32_platform.h
	src/win32_window.c
	src/x11_fullscreen.c
	src/x11_platform.h
	tests/listmodes.c
2012-07-05 16:15:01 +02:00
Camilla Berglund
cbe29b4963 Merge branch 'master' into clipboard 2012-03-29 14:30:21 +02:00
Camilla Berglund
fcf54b4b27 Moved dynamic loading macros to configuration header. 2012-03-29 14:21:04 +02:00
Camilla Berglund
dd8b098387 Moved _GLFW_BUILD_DLL into configuration header. 2012-03-29 14:06:26 +02:00
Camilla Berglund
92d4c02e07 Merge branch 'master' into clipboard
Conflicts:
	src/CMakeLists.txt
2012-03-29 13:29:28 +02:00
Camilla Berglund
d022e54934 Merge branch 'master' into clipboard 2012-03-28 14:58:03 +02:00
Camilla Berglund
a12b395442 Added headers to project. 2012-03-26 15:21:13 +02:00
Camilla Berglund
6fd6c5f7e4 Moved pkg-config file generation. 2012-03-26 03:11:43 +02:00
Camilla Berglund
e53bbfd2dd Renamed pkg-config file template. 2012-03-26 03:06:45 +02:00
Camilla Berglund
865aa05ec1 Merge branch 'master' into clipboard
Conflicts:
	src/CMakeLists.txt
	src/libglfw.pc.cmake
2012-03-26 03:04:29 +02:00
Camilla Berglund
2588c9be17 Renamed GLFW_BUILD_DLL to _GLFW_BUILD_DLL. 2012-03-25 17:40:30 +02:00
Camilla Berglund
bd8eb1399a Put platform detection in a single place. 2012-03-25 16:51:24 +02:00
Camilla Berglund
20e685d37b Formatted variables not used outside of the local CMake project. 2012-03-25 16:49:15 +02:00
Camilla Berglund
d743793e71 Pkg-config dependency generation fixes. 2012-03-25 14:51:56 +02:00
Camilla Berglund
7b46a184cb Added standard option to switch between static and dynamic library, dropped dynamic test. 2012-03-25 13:55:39 +02:00
Camilla Berglund
812ad163eb Formatting. 2012-03-22 14:29:23 +01:00
Camilla Berglund
cd7b9b1568 CMake file formatting. 2012-02-29 20:15:39 +01:00
Camilla Berglund
a82598ea24 Disable dynamic loading for Win32 DLL. 2012-02-29 19:52:34 +01:00
Camilla Berglund
ea36557b93 Merge remote-tracking branch 'raedwulf/clipboard' into clipboard
Conflicts:
	src/CMakeLists.txt
2012-02-19 13:43:26 +01:00
Tai Chi Minh Ralph Eastwood
5937af089e Merge branch 'master' of github.com:raedwulf/glfw into clipboard
Conflicts:
	src/CMakeLists.txt
	tests/CMakeLists.txt
2012-02-19 06:29:48 +00:00
Camilla Berglund
e7f7c19de3 Made C-only modules C. 2012-02-15 01:20:27 +01:00
Camilla Berglund
6b98a04d17 Merge branch 'utf8' into multi-monitor
Conflicts:
	src/CMakeLists.txt
2012-02-04 20:12:28 +01:00
Camilla Berglund
ce288a8939 Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode. 2012-02-04 00:51:35 +01:00
Marcel Metz
4c6681bad6 Merge branch 'master' into multi-display-support
Conflicts:
	src/CMakeLists.txt
	src/input.c
2011-11-22 16:06:24 +01:00
Camilla Berglund
85982b2985 Removed Cygwin cross-compilation hacks. 2011-11-03 00:13:49 +01:00
Camilla Berglund
9738728298 Reshuffling, formatting and shortening. 2011-10-06 23:28:56 +02:00
Marcel Metz
29a4eca87d Renamed monitor related files. 2011-10-03 14:22:06 -04:00
Marcel Metz
a905e671b3 Implemented display iteration for win32 platform. 2011-10-02 16:47:15 -04:00
Marcel Metz
beacbb3447 Implemented display iteration for x11. Added attributes and queries for physical size, name and logical position. Updated test executable. 2011-10-02 16:47:06 -04:00
Ralph Eastwood
31c91545be Added clipboard stubs. 2011-09-21 10:09:47 +01:00
Camilla Berglund
4e9c34952c Pkg-config file generation work. 2011-09-19 18:46:20 +02:00
Camilla Berglund
3b733b91bb Fixed header include paths. 2011-09-06 17:32:41 +02:00
Camilla Berglund
81cfc1001d Moved glext headers to separate directory for clarity. 2011-09-06 14:33:25 +02:00
Camilla Berglund
673b42d8da Formatting. 2011-07-26 16:59:37 +02:00
Camilla Berglund
53f4f54c46 Flattened source tree. 2011-07-26 16:50:12 +02:00