Commit Graph

4656 Commits

Author SHA1 Message Date
Marcel Metz
a69974403e Added x11 support for monitor PnP detection. 2012-01-30 16:21:21 +01:00
Marcel Metz
df64773a44 Moved monitor callback to shared implementation. 2012-01-30 14:55:23 +01:00
Marcel Metz
f228d23024 Moved platform specific monitor list creation part to separate functions. 2012-01-30 12:33:32 +01:00
Marcel Metz
6f970f5753 Made monitor list cleanup shared. 2012-01-30 12:04:16 +01:00
Camilla Berglund
fa17b7e616 Compatibility fixes. 2012-01-30 00:02:54 +01:00
Camilla Berglund
e490528662 Added credit. 2012-01-29 19:14:22 +01:00
Camilla Berglund
f0de0c6466 Removed duplicate libm and librt setup. 2012-01-29 19:13:08 +01:00
Camilla Berglund
26c95559d2 Merge remote-tracking branch 'adrian/multi-display-support' into multi-monitor
Conflicts:
	.gitignore
2012-01-29 19:09:20 +01:00
Camilla Berglund
cd1caded8d Added credit. 2012-01-29 17:23:34 +01:00
Camilla Berglund
0cb77a31b6 Formatting. 2012-01-29 17:08:22 +01:00
Camilla Berglund
32f186e82d Made joystick array static. 2012-01-29 15:51:09 +01:00
Camilla Berglund
ea8c7029a7 Formatting. 2012-01-29 15:41:06 +01:00
Camilla Berglund
e26fd639f9 Disabled debug printing. 2012-01-29 15:39:35 +01:00
Camilla Berglund
58bb6b5288 Formatting. 2012-01-29 15:38:22 +01:00
Camilla Berglund
3ff48b5b47 Formatting. 2012-01-29 15:37:29 +01:00
Camilla Berglund
98173ece03 Removed calls to exit on joystick init failure. 2012-01-29 15:32:16 +01:00
Camilla Berglund
a5b8c8db18 Replaced malloc and free with GLFW allocator. 2012-01-29 15:30:43 +01:00
Camilla Berglund
e05f0c0f53 Formatting. 2012-01-29 15:30:01 +01:00
Camilla Berglund
2935652f48 Merge remote-tracking branch 'tikhomirov/osx_joystick'
Conflicts:
	.gitignore
	src/cocoa_init.m
2012-01-29 15:05:58 +01:00
Marcel Metz
01f9d0e32c Merge branch 'master' into multi-display-support 2012-01-29 11:22:29 +01:00
Marcel Metz
bc237f885c Merge branch 'master' into multi-display-support 2012-01-28 20:48:38 +01:00
Camilla Berglund
24dc846ac2 Re-used library list. 2012-01-28 00:12:06 +01:00
Camilla Berglund
a6981b7f83 Function and symbol checks are only performed on X11/GLX. 2012-01-28 00:01:05 +01:00
Camilla Berglund
0dac7131c8 Removed extra warning flags for Universal build. 2012-01-27 23:41:07 +01:00
Camilla Berglund
9433ba94a5 Removed unused macro variable. 2012-01-27 23:39:31 +01:00
Camilla Berglund
ebe4df478b Formatting. 2012-01-27 23:37:55 +01:00
Camilla Berglund
966076eca8 Added libm dependency for X11/GLX. 2012-01-27 23:17:20 +01:00
Camilla Berglund
e93ae44ee5 Formatting. 2012-01-24 18:28:37 +01:00
Marcel Metz
c7a5474bfc Merged with master. 2012-01-24 18:00:51 +01:00
Camilla Berglund
8f3b21eb81 Merge branch 'master' of github.com:elmindreda/glfw 2012-01-20 02:24:17 +01:00
Camilla Berglund
1187c7da62 Ported the temporary cursor jitter fix from 2.7.3. 2012-01-20 02:23:27 +01:00
Camilla Berglund
57f9602b0e Removed speculation. 2012-01-18 21:13:06 +01:00
Camilla Berglund
1ca5391acd Removed trailing whitespace. 2012-01-18 21:12:34 +01:00
Camilla Berglund
6add995b06 Formatting. 2012-01-18 19:59:42 +01:00
Camilla Berglund
d322fa1ab4 Added workaround for APIENTRY. 2012-01-18 18:44:28 +01:00
Camilla Berglund
379d0025ec Removed library name from version string to more closely match OpenGL format. 2012-01-18 18:15:28 +01:00
Camilla Berglund
cde95f72c0 Made X extensions be adjacent in version string. 2012-01-18 18:13:31 +01:00
Camilla Berglund
129ef3f72a Added Xkb presence to version string. 2012-01-18 17:51:46 +01:00
Camilla Berglund
d0ae6cbe8a Keep APIENTRY public (used by GL_ARB_debug_output). 2012-01-18 17:50:51 +01:00
Marcel Metz
7fbb707ac3 Added tests to gitignore. 2012-01-11 09:11:34 +01:00
Camilla Berglund
2b106336ae Updated .gitignore. 2012-01-10 21:39:16 +01:00
Camilla Berglund
87f713a5e2 Added glfwInit exception comment. 2012-01-10 21:35:13 +01:00
Camilla Berglund
e81b2decac Removed NULL already defined by stddef.h header. 2011-12-18 17:22:58 +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
a559b5da98 Added rudimentary detection of librt. 2011-11-03 02:43:10 +01:00
Camilla Berglund
d929752a42 Clarified functions. 2011-11-03 02:41:53 +01:00
Camilla Berglund
85982b2985 Removed Cygwin cross-compilation hacks. 2011-11-03 00:13:49 +01:00
Camilla Berglund
8117f4e48d Finished dynamic linking test debug output. 2011-11-02 23:10:04 +01:00
Camilla Berglund
0c122bb8ad Added dynamic linking test. 2011-11-02 17:59:18 +01:00
Camilla Berglund
96267c8696 Formatting. 2011-11-02 17:34:27 +01:00