dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-01-31 13:40:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

CMake: Don't try to find X11

Browse source 
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 <SDL_syswm.h> 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.
This commit is contained in:
Daniel Gibson 2019-01-13 19:06:32 +01:00
parent cd0ec54991
commit 08970f186d
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
neo/CMakeLists.txt
View file

@ -121,11 +121,6 @@ include_directories(${VORBISFILE_INCLUDE_DIR})
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR})
if(NOT AROS)
find_package(X11 REQUIRED)
include_directories(${X11_INCLUDE_DIR})
endif()
if (SDL2) if (SDL2)
# skip SDL2main # skip SDL2main
if(APPLE OR WIN32) if(APPLE OR WIN32)

1
neo/sys/glimp.cpp
View file

@ -27,7 +27,6 @@ If you have questions concerning this license or the applicable additional terms
*/ */
#include <SDL.h> #include <SDL.h>
#include <SDL_syswm.h>
#include "sys/platform.h" #include "sys/platform.h"
#include "framework/Licensee.h" #include "framework/Licensee.h"