Commit Graph

43 Commits

Author SHA1 Message Date
Camilla Berglund
830f2b439c Cleanup. 2012-09-12 20:41:14 +02:00
Camilla Berglund
83f5b920b9 Merge branch 'master' into multi-monitor
Conflicts:
	.gitignore
	src/CMakeLists.txt
	src/x11_window.c
2012-09-12 06:04:17 +02:00
Camilla Berglund
52c27113d3 Shortened PC boolean name. 2012-09-02 15:21:40 +02:00
Camilla Berglund
854e634fec Merge branch 'master' into multi-monitor
Conflicts:
	include/GL/glfw3.h
	src/CMakeLists.txt
	src/fullscreen.c
	src/internal.h
	src/win32_fullscreen.c
	src/win32_platform.h
	src/x11_fullscreen.c
	tests/modes.c
2012-08-03 02:57:33 +02:00
Camilla Berglund
fc74a5533e Moved WGL context logic into OpenGL module. 2012-07-31 22:48:28 +02:00
Camilla Berglund
db066b4f46 Win32 Unicode fixes. 2012-07-06 14:04:57 +02: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
cef9dea1d2 Unified nomenclature for cursor positions. 2012-06-22 13:57:25 +02:00
Camilla Berglund
21e77fe1a6 Split platform-specific global data. 2012-04-22 15:53:02 +02:00
Camilla Berglund
f868712f02 Simplified clipboard API. 2012-04-12 00:51:58 +02:00
Camilla Berglund
2753577dbd Removed dynamic loading of gdi32. 2012-03-30 02:28:15 +02:00
Camilla Berglund
532e0dd2f6 Formatting. 2012-03-30 01:55:28 +02:00
Camilla Berglund
cd44a7182b Removed re-definitions of Win32 things now ancient. 2012-03-30 01:54:50 +02:00
Matt Arsenault
3bcde7e1cd Only define Win32 crud macros if not defined already 2012-03-29 17:41:05 -04:00
Camilla Berglund
466246670f Merge branch 'master' into cursor-enter-leave 2012-03-26 13:54:28 +02:00
Camilla Berglund
8d2c2791c2 Added initial Linux MinGW-w64 support. 2012-03-22 16:57:38 +01:00
Camilla Berglund
742299faaa Merged implementation for Win32. 2012-03-22 13:17:44 +01:00
Camilla Berglund
fb465377e3 Merge remote-tracking branch 'adrian/multi-display-support' into multi-monitor 2012-02-05 02:50:22 +01:00
Camilla Berglund
32b07923ab Formatting. 2012-02-05 02:43:49 +01:00
Camilla Berglund
fccef20b76 Added explicit WINVER, avoid redefining UNICODE. 2012-02-05 02:41:52 +01:00
Camilla Berglund
84579305cb Made string conversions globally available. 2012-02-05 02:07:50 +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
9c0c2c6b08 Upgraded Win32 port to Unicode mode. 2012-02-03 20:34:24 +01:00
Marcel Metz
5a16042c8a Fixed mingw compile errors. 2012-01-31 23:47:01 +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
Marcel Metz
c7a5474bfc Merged with master. 2012-01-24 18:00:51 +01:00
Camilla Berglund
d322fa1ab4 Added workaround for APIENTRY. 2012-01-18 18:44:28 +01:00
Marcel Metz
85d4bfcff5 Implemented monitor (dis)connect callback for win32. 2011-10-14 14:32:06 -04:00
Marcel Metz
ac57be060d Merge branch 'master' into multi-display-support
Conflicts:
	src/fullscreen.c
	src/win32_window.c
	src/x11_fullscreen.c
2011-10-07 00:35:37 -04:00
Camilla Berglund
9738728298 Reshuffling, formatting and shortening. 2011-10-06 23:28:56 +02:00
Camilla Berglund
970269cf3a Merge branch 'master' of github.com:elmindreda/glfw 2011-10-05 00:52:45 +02:00
Camilla Berglund
0322d8fba0 Made Win32 port build (functionality soon). 2011-10-05 00:47:39 +02:00
Marcel Metz
426df42d00 Replaced display with monitor in monitor related api. 2011-10-03 03:24:35 -04:00
Marcel Metz
58d4323ece Implemented display aware glfwVideoModes function for X11 XRandR and win32. 2011-10-02 16:47:15 -04:00
Marcel Metz
a905e671b3 Implemented display iteration for win32 platform. 2011-10-02 16:47:15 -04:00
Marcel Metz
d5def558d3 Renamed struct member to match x11 naming. 2011-10-01 01:48:42 -04:00
Camilla Berglund
a98c66c8cb Added glext header explanation. 2011-09-22 14:15:07 +02:00
Camilla Berglund
3b733b91bb Fixed header include paths. 2011-09-06 17:32:41 +02:00
Camilla Berglund
30e362d435 Shortened native extension boolean names. 2011-09-06 14:51:03 +02:00
Camilla Berglund
4afc67c1df Various Windows and VC++ 2010 fixes. 2011-07-27 17:09:17 +02:00
Camilla Berglund
53f4f54c46 Flattened source tree. 2011-07-26 16:50:12 +02:00