From 7ee34acae850dc3e548dda3d4426132af5bb5d4b Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Sat, 3 Feb 2018 13:20:48 +0100 Subject: [PATCH] Remove winquake.h The only thing that header did was to include windows.h. --- CMakeLists.txt | 1 - src/backends/windows/header/winquake.h | 48 -------------------------- src/backends/windows/shared/mem.c | 3 +- 3 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 src/backends/windows/header/winquake.h diff --git a/CMakeLists.txt b/CMakeLists.txt index a5da39bf..202501be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,7 +198,6 @@ set(Backends-Windows-Source set(Backends-Windows-Header ${BACKENDS_SRC_DIR}/windows/header/resource.h - ${BACKENDS_SRC_DIR}/windows/header/winquake.h ) set(REF-Windows-Source diff --git a/src/backends/windows/header/winquake.h b/src/backends/windows/header/winquake.h deleted file mode 100644 index 0aadbfd6..00000000 --- a/src/backends/windows/header/winquake.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 1997-2001 Id Software, Inc. - * - * This program 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 2 of the License, or (at - * your option) any later version. - * - * This program 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * ======================================================================= - * - * Header file for Windows specific stuff. - * - * ======================================================================= - */ - -#ifndef WIN_WINQUAKE_H -#define WIN_WINQUAKE_H - -#include - -#define WINDOW_STYLE (WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_VISIBLE) - -#ifndef _PC_24 - #define _PC_24 0x00020000 -#endif - -#ifndef _MCW_PC - #define _MCW_PC 0x00030000 -#endif - -extern HINSTANCE global_hInstance; -extern qboolean ActiveApp, Minimized; -extern int window_center_x, window_center_y; -extern RECT window_rect; - -#endif - diff --git a/src/backends/windows/shared/mem.c b/src/backends/windows/shared/mem.c index e4f358a7..97bb925b 100644 --- a/src/backends/windows/shared/mem.c +++ b/src/backends/windows/shared/mem.c @@ -24,8 +24,9 @@ * ======================================================================= */ +#include + #include "../../../common/header/common.h" -#include "../header/winquake.h" byte *membase; int hunkcount;