mirror of
https://github.com/SFML/SFML.git
synced 2024-11-24 20:31:05 +08:00
Update to make compilation possible of 2.4.x on Arch.
This commit is contained in:
parent
b7be4b299e
commit
32c2c1926a
@ -25,8 +25,8 @@
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
// Headers
|
// Headers
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
|
#include <SFML/Window/Unix/WindowImplX11.hpp> // important to be included first (conflict with None)
|
||||||
#include <SFML/Window/Unix/GlxContext.hpp>
|
#include <SFML/Window/Unix/GlxContext.hpp>
|
||||||
#include <SFML/Window/Unix/WindowImplX11.hpp>
|
|
||||||
#include <SFML/Window/Unix/Display.hpp>
|
#include <SFML/Window/Unix/Display.hpp>
|
||||||
#include <SFML/System/Mutex.hpp>
|
#include <SFML/System/Mutex.hpp>
|
||||||
#include <SFML/System/Lock.hpp>
|
#include <SFML/System/Lock.hpp>
|
||||||
|
@ -25,11 +25,12 @@
|
|||||||
#ifndef SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP
|
#ifndef SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP
|
||||||
#define SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP
|
#define SF_POINTER_C_GENERATED_HEADER_GLXWIN_HPP
|
||||||
|
|
||||||
#ifdef __glxext_h_
|
#if defined(__glxext_h_) || defined(__glx_glxext_h_)
|
||||||
#error Attempt to include glx_exts after including glxext.h
|
#error Attempt to include glx_exts after including glxext.h
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define __glxext_h_
|
#define __glxext_h_
|
||||||
|
#define __glx_glxext_h_
|
||||||
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user