Commit Graph

99 Commits

Author SHA1 Message Date
Camilla Berglund
fc79e0a3a8 Removed threading package option.
It didn't do what I thought it did.
2013-01-05 18:43:09 +01:00
Camilla Berglund
279c32e3f9 Merge branch 'master' of github.com:elmindreda/glfw
Conflicts:
	CMakeLists.txt
	src/egl_context.c
2013-01-05 18:37:12 +01:00
Camilla Berglund
3d0ff1324c Restored use of CMake Threads package. 2013-01-05 18:33:11 +01:00
Camilla Berglund
7ff86576e3 Removed EGL dlopen. 2013-01-04 06:59:07 +01:00
Camilla Berglund
1aa34606e7 Fixes for use with the AMD EGL/GLES SDK. 2013-01-04 03:54:52 +01:00
Camilla Berglund
73cdc34df7 Merge branch 'master' into multi-monitor
Conflicts:
	CMakeLists.txt
	readme.html
	src/CMakeLists.txt
	src/cocoa_platform.h
	src/win32_platform.h
	src/x11_platform.h
	tests/events.c
2012-12-02 20:52:03 +01:00
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