From b9cc8548dc2852e2f4225fb669498a8a9021cd45 Mon Sep 17 00:00:00 2001 From: dhewg Date: Fri, 15 Jun 2012 18:25:48 +0200 Subject: [PATCH] Remove leftover X11 header --- neo/sys/linux/dedicated.cpp | 2 -- neo/sys/linux/local.h | 56 ------------------------------------- neo/sys/linux/main.cpp | 2 -- 3 files changed, 60 deletions(-) delete mode 100644 neo/sys/linux/local.h diff --git a/neo/sys/linux/dedicated.cpp b/neo/sys/linux/dedicated.cpp index 7cb09f2e..c9f0f8d0 100644 --- a/neo/sys/linux/dedicated.cpp +++ b/neo/sys/linux/dedicated.cpp @@ -30,8 +30,6 @@ If you have questions concerning this license or the applicable additional terms #include "renderer/tr_local.h" #include "sys/posix/posix_public.h" -#include "sys/linux/local.h" - /* ================ Sys_GetVideoRam diff --git a/neo/sys/linux/local.h b/neo/sys/linux/local.h deleted file mode 100644 index a27cceb6..00000000 --- a/neo/sys/linux/local.h +++ /dev/null @@ -1,56 +0,0 @@ -/* -=========================================================================== - -Doom 3 GPL Source Code -Copyright (C) 1999-2011 id Software LLC, a ZeniMax Media company. - -This file is part of the Doom 3 GPL Source Code ("Doom 3 Source Code"). - -Doom 3 Source Code is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Doom 3 Source Code is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Doom 3 Source Code. If not, see . - -In addition, the Doom 3 Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 Source Code. If not, please request a copy in writing from id Software at the address below. - -If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA. - -=========================================================================== -*/ -#ifndef __LINUX_LOCAL_H__ -#define __LINUX_LOCAL_H__ - -#include - -//#define ID_ENABLE_DGA - -#if defined( ID_ENABLE_DGA ) -#include -#endif -#include -#include - -#include "renderer/RenderSystem.h" -#include "renderer/tr_local.h" - -extern Display *dpy; -extern Window win; - -// input.cpp -extern bool dga_found; -void Sys_XEvents(); -void Sys_XUninstallGrabs(); - -#define KEY_MASK (KeyPressMask | KeyReleaseMask) -#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ButtonMotionMask ) -#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask ) - -#endif diff --git a/neo/sys/linux/main.cpp b/neo/sys/linux/main.cpp index be074027..2b8c6887 100644 --- a/neo/sys/linux/main.cpp +++ b/neo/sys/linux/main.cpp @@ -40,8 +40,6 @@ If you have questions concerning this license or the applicable additional terms #include "sys/posix/posix_public.h" #include "sys/sys_local.h" -#include "sys/linux/local.h" - #include static idStr basepath;