Commit Graph

293 Commits

Author SHA1 Message Date
Camilla Berglund
5da8ed250a Cleanup of backend option strings. 2012-12-02 19:01:20 +01:00
Camilla Berglund
34d383399c Finished initial window/context backend split. 2012-11-27 15:02:26 +01:00
Camilla Berglund
b49c78ed96 Added missing whitespace. 2012-11-27 14:02:48 +01:00
Camilla Berglund
e4ddcefc14 Merge branch 'master' into EGL
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
2012-11-27 12:21:54 +01:00
Camilla Berglund
e82683d498 Merge branch 'master' into multi-monitor 2012-11-08 16:29:56 +01:00
Camilla Berglund
ad7bf4beba Replaced ad-hoc Linux detection with __linux__. 2012-11-05 16:19:11 +01:00
Camilla Berglund
9d6945a766 Merge branch 'master' into EGL
Conflicts:
	CMakeLists.txt
	include/GL/glfw3.h
	readme.html
	src/CMakeLists.txt
	src/internal.h
	src/window.c
2012-09-23 15:35:45 +02:00
Camilla Berglund
f6ba959b1b Moved threads package to X11 block. 2012-09-12 21:54:00 +02:00
Camilla Berglund
d5e4204ed1 POSIX threads should not be preferred on Win32. 2012-09-12 21:46:40 +02:00
Camilla Berglund
64c677be9e Renamed config macro to match convention. 2012-09-12 03:17:50 +02:00
Camilla Berglund
7be55239e7 Disabled native API by default. 2012-09-11 20:02:13 +02:00
Camilla Berglund
0272ce2e98 Merge branch 'master' into EGL
Conflicts:
	src/glx_opengl.c
	src/opengl.c
	tests/glfwinfo.c
2012-09-09 19:52:33 +02:00
Camilla Berglund
cbcab56a25 Merge branch 'master' into EGL
Conflicts:
	include/GL/glfw3.h
	src/opengl.c
	src/win32_opengl.c
	src/window.c
	src/x11_fullscreen.c
	src/x11_glx_opengl.c
	src/x11_platform.h
	src/x11_window.c
	tests/glfwinfo.c
2012-09-06 21:05:03 +02:00
Camilla Berglund
9af03e141b Merge branch 'master' into tls 2012-08-14 14:00:19 +02:00
Camilla Berglund
b7be8d90d8 Renamed libglfw3.pc to glfw3.pc. 2012-08-12 22:31:47 +02:00
Camilla Berglund
98c1c2fbf2 Added threading support to CMake files. 2012-08-12 16:18:59 +02:00
jonathan MERCIER
31c0212c25 Able to install to lib64 if LIB_SUFFIX var is set to 64 2012-08-11 17:50:56 +02:00
Camilla Berglund
0b25bba5b5 Merge branch 'master' into EGL 2012-07-31 18:55:00 +02:00
John Bartholomew
0f0e42b975 Use SOVERSION for shared libraries on Unix-like systems. 2012-07-30 01:04:08 +01:00
John Bartholomew
93ec9fa901 Changed library output name to "glfw3", and pkg-config name to libglfw3.
Since the headers are already named differently, this allows
side-by-side installation of GLFW 2.x and GLFW 3.x.
2012-07-30 00:14:09 +01:00
Camilla Berglund
3f9fa39564 Merge branch 'master' into EGL
Conflicts:
	src/CMakeLists.txt
2012-07-22 16:19:24 +02:00
Camilla Berglund
df6d4bc58a Added glfw3native.h to installation. 2012-07-22 15:42:18 +02:00
Camilla Berglund
af925681dd Merge branch 'master' into EGL 2012-07-20 00:59:35 +02:00
Camilla Berglund
f004aa0f82 Formatting. 2012-07-19 22:29:01 +02:00
Camilla Berglund
5e36fb0e38 Formatting. 2012-07-19 02:35:34 +02:00
Camilla Berglund
c1931eda37 Formatting, limited to MSVC. 2012-07-19 02:15:01 +02:00
Jorge Rodriguez
0627a2c2eb Added option for MSVC static runtime library. 2012-07-19 02:12:33 +02:00
Cloudef
29b4ed4e9a Don't build tests and examples when building with EGL 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
2753577dbd Removed dynamic loading of gdi32. 2012-03-30 02:28:15 +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
4a3d85e9b1 Merge branch 'master' of github.com:elmindreda/glfw 2012-03-26 13:36:36 +02:00
Camilla Berglund
ee1d71adf3 Added OS X support to pkg-config file. 2012-03-26 13:35:14 +02:00
Camilla Berglund
2a8324955c Formatting. 2012-03-26 13:14:06 +02:00
Camilla Berglund
fd6bc698c0 Moved file generation around. 2012-03-26 12:54:50 +02:00
Camilla Berglund
6fd6c5f7e4 Moved pkg-config file generation. 2012-03-26 03:11:43 +02:00
Camilla Berglund
415ebbb97c Added cache variable for dependencies of GLFW. 2012-03-25 20:15:27 +02:00
Camilla Berglund
c097246312 Fixed listing of non-pkg-config libraries. 2012-03-25 17:34:21 +02:00
Camilla Berglund
8dc1391835 Marked library variable as advanced. 2012-03-25 17:25:03 +02:00
Camilla Berglund
730e2e55c9 Removed unused module. 2012-03-25 17:24:33 +02:00
Camilla Berglund
cfa798451e Fixed platform messages being mixed up. 2012-03-25 17:23:24 +02:00
Camilla Berglund
862efe78e3 Added fallback check for dlopen, clearer use of required libraries. 2012-03-25 17:22:35 +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
441452467a Marked library variables as advanced. 2012-03-25 15:05:48 +02:00
Camilla Berglund
d743793e71 Pkg-config dependency generation fixes. 2012-03-25 14:51:56 +02:00
Camilla Berglund
4a905d2e28 Comment update. 2012-03-25 14:43:23 +02:00
Camilla Berglund
9e8f547774 Formatting. 2012-03-25 13:59:34 +02:00
Camilla Berglund
23776f67e3 Formatting. 2012-03-25 13:58:07 +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
f21f196036 Added comment. 2012-03-25 13:52:35 +02:00
Camilla Berglund
7f1d91e67b Formatting. 2012-03-25 13:49:35 +02:00
Camilla Berglund
c175084e13 Added workaround for CMake bug 0006976. 2012-03-25 13:47:13 +02:00
Camilla Berglund
d204d5a434 Enabled all warnings on GNU C and compatibles. 2012-03-22 23:25:39 +01:00
Camilla Berglund
e7fb35a5d8 Removed legacy CMake policy. 2012-03-01 03:41:36 +01:00
Camilla Berglund
a27c444af4 Updated comment. 2012-02-29 20:19:05 +01:00
Camilla Berglund
537754aab8 Require CMake 2.8. 2012-02-29 20:17:09 +01:00
Camilla Berglund
cd7b9b1568 CMake file formatting. 2012-02-29 20:15:39 +01:00
Camilla Berglund
d608eb0086 Replaced hand rolled X extension detection with built-in version. 2012-02-19 05:28:15 +01:00
Camilla Berglund
b5cd3114af Added Doxyfile generation. 2012-02-02 18:15:58 +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
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
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
Sergey Tikhomirov
2357cf6f30 Added initial joystick support on OS X 2011-09-18 22:05:00 +03:00
Camilla Berglund
b11681a3ab Added CMake options to disable building of examples and/or tests. 2011-09-06 15:23:44 +02:00
Camilla Berglund
7268fc18b4 Don't clobber higher-level uninstall targets. 2011-07-27 15:46:19 +02:00
Camilla Berglund
53f4f54c46 Flattened source tree. 2011-07-26 16:50:12 +02:00
Camilla Berglund
aae8999ecf Moved OpenGL-related functions into *opengl files. 2011-03-04 14:25:12 +01:00
marcus256
8943a78a65 Merge branch 'marcus-rawkeys'. Changed handling of raw key codes. 2011-01-15 00:59:55 +01:00
Marcus
a44d566057 Added compile time detection of the XKB X11 extension. 2011-01-03 21:44:05 +01:00
Camilla Berglund
71d64a03d8 Added build option to choose between native and Universal Binary builds. 2010-11-17 16:36:09 +01:00
Camilla Berglund
5a112d6cd1 Moved platform identifier define to config header. 2010-11-17 14:59:27 +01:00
Camilla Berglund
0e1a004b7d Formatting. 2010-10-15 17:22:30 +02:00
Camilla Berglund
2c851406fb Renamed config.h source file. 2010-10-14 17:18:29 +02:00
Camilla Berglund
2630d4968c Initial implementation of experimental gamma ramp API. 2010-10-13 04:04:43 +02:00
Camilla Berglund
f0b2ddad3d GLFW header was incorrectly installed. 2010-10-03 17:56:27 +02:00
Camilla Berglund
47ea99b81e Re-enabled Linux joystick API. 2010-09-25 19:26:40 +02:00
Olivier Delannoy
a33c5d56cb Initial support for cross-compilation with support for cross compilation to win32 2010-09-20 19:56:44 +01:00
Camilla Berglund
b7dceecc53 Formatting. 2010-09-17 04:22:48 +02:00
Camilla Berglund
3ca63a0cf3 Replaced platform specific config headers with shared one, updated version strings to include CMake version. 2010-09-17 00:54:11 +02:00
Camilla Berglund
bbdcb35dbb Message tweaks. 2010-09-15 17:14:21 +02:00
Camilla Berglund
728d52dc50 Updated GLFW version. 2010-09-11 15:27:48 +02:00
Camilla Berglund
f5d74c4f9a Added error management from pre-3.0 branch. 2010-09-09 21:06:59 +02:00
Camilla Berglund
445bf1ea33 Renamed lib directory to src. 2010-09-09 20:01:43 +02:00
Camilla Berglund
3249f812d6 Initial import of 2.7 Lite. 2010-09-07 17:34:51 +02:00