diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2016-12-07 14:45:14 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2016-12-07 14:45:14 +0000 |
commit | 8dead45cb366bf5c08539bef2ccaa36b80eb1483 (patch) | |
tree | 25bdc2041b9d00d0e2e1e46ece0f96b8aaca0527 /include/epoxy/wgl.h | |
parent | 0aa9d1bc831683bfe93980eb3cffa1f0c2f058fb (diff) | |
download | libepoxy-8dead45cb366bf5c08539bef2ccaa36b80eb1483.tar.gz |
Revert all changes since 8bbc0d40
Most of the changes that happened after commit 8bbc0d40 broke epoxy
pretty much irreparably because of the CMake build and the attempt at
making libepoxy a static library that can be copy-pasted into another
project without generating files.
Since all the commits are entangled, and are full of unrelated changes,
we cannot simply do a localized set of reverts; instead, we need to hit
the reset button.
From this point forward, we're going to improve libepoxy's build while
attempting to keep the existing build system working. This may mean
reinstating the CMake build system at a later date.
Diffstat (limited to 'include/epoxy/wgl.h')
-rw-r--r-- | include/epoxy/wgl.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/epoxy/wgl.h b/include/epoxy/wgl.h index 250e419..fdd7b4f 100644 --- a/include/epoxy/wgl.h +++ b/include/epoxy/wgl.h @@ -30,21 +30,22 @@ #ifndef EPOXY_WGL_H #define EPOXY_WGL_H -#if defined(__wglxext_h_) -#error "epoxy/wgl.h" must be included before (or in place of) "wglext.h" -#endif - -#define __wglxext_h_ - -#include "epoxy/gl.h" - #ifdef __cplusplus extern "C" { #endif +#include <stdbool.h> +#include <windows.h> + #undef wglUseFontBitmaps #undef wglUseFontOutlines +#if defined(__wglxext_h_) +#error epoxy/wgl.h must be included before (or in place of) wgl.h +#else +#define __wglxext_h_ +#endif + #ifdef UNICODE #define wglUseFontBitmaps wglUseFontBitmapsW #else |