From 08970f186dae00f87f49825fc5c368117fb03975 Mon Sep 17 00:00:00 2001 From: Daniel Gibson Date: Sun, 13 Jan 2019 19:06:32 +0100 Subject: [PATCH] CMake: Don't try to find X11 causes trouble on macOS, and we shouldn't interact with X11 directly anyway, because SDL does it for us. OpenBSD apparently needed it (at least it was added for OpenBSD support), but the only place I can imagine it being needed is the superfluous #include in neo/sys/glimp.cpp - which I now removed. In case it's needed after all please tell me, then I'll add it again - but guarded by if(os STREQUALS "OpenBSD") or however one checks for OpenBSD in CMake. --- neo/CMakeLists.txt | 5 ----- neo/sys/glimp.cpp | 1 - 2 files changed, 6 deletions(-) diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index 1e4d62ff..37ce393e 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -121,11 +121,6 @@ include_directories(${VORBISFILE_INCLUDE_DIR}) find_package(OpenAL REQUIRED) include_directories(${OPENAL_INCLUDE_DIR}) -if(NOT AROS) - find_package(X11 REQUIRED) - include_directories(${X11_INCLUDE_DIR}) -endif() - if (SDL2) # skip SDL2main if(APPLE OR WIN32) diff --git a/neo/sys/glimp.cpp b/neo/sys/glimp.cpp index c92e6c2b..8b19b526 100644 --- a/neo/sys/glimp.cpp +++ b/neo/sys/glimp.cpp @@ -27,7 +27,6 @@ If you have questions concerning this license or the applicable additional terms */ #include -#include #include "sys/platform.h" #include "framework/Licensee.h"