From 12ea33ad62989be8cf80a3e05c1e577de175512a Mon Sep 17 00:00:00 2001
From: Jamie Wilkinson <jaq@spacepants.org>
Date: Sun, 3 Mar 2002 10:24:25 +0000
Subject: [PATCH] Moved q2icon.xbm out of the source subdir and into pixmaps/

---
 src/gl_glx.c   |  2 +-
 src/q2icon.xbm | 14 --------------
 src/rw_sdl.c   |  2 +-
 src/rw_x11.c   |  2 +-
 4 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 src/q2icon.xbm

diff --git a/src/gl_glx.c b/src/gl_glx.c
index 01f23ed..9f38fce 100644
--- a/src/gl_glx.c
+++ b/src/gl_glx.c
@@ -814,7 +814,7 @@ int GLimp_SetMode( unsigned int *pwidth, unsigned int *pheight, int mode, qboole
 
 	wmhints = XAllocWMHints();
 	if (wmhints) {
-		#include "q2icon.xbm"
+		#include "../pixmaps/q2icon.xbm"
 
 		Pixmap icon_pixmap, icon_mask;
 		unsigned long fg, bg;
diff --git a/src/q2icon.xbm b/src/q2icon.xbm
deleted file mode 100644
index 0a8e217..0000000
--- a/src/q2icon.xbm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define q2icon_width 32
-#define q2icon_height 32
-static unsigned char q2icon_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0x03, 0xc0, 0x00,
-   0x80, 0x01, 0x80, 0x01, 0xc0, 0x00, 0x00, 0x03, 0x60, 0x00, 0x00, 0x06,
-   0x60, 0x00, 0x00, 0x06, 0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00, 0x0c,
-   0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00, 0x0c,
-   0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00, 0x0c, 0x70, 0x00, 0x00, 0x0e,
-   0x70, 0xf0, 0x0f, 0x0e, 0xe0, 0xe0, 0x07, 0x07, 0xe0, 0x61, 0x86, 0x07,
-   0xc0, 0x63, 0xc6, 0x03, 0x80, 0x7f, 0xfe, 0x01, 0x00, 0xff, 0xff, 0x00,
-   0x00, 0xfe, 0x7f, 0x00, 0x00, 0xf8, 0x1f, 0x00, 0x00, 0xe0, 0x07, 0x00,
-   0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00,
-   0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00,
-   0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00 };
diff --git a/src/rw_sdl.c b/src/rw_sdl.c
index c0f4fdf..b89b32f 100644
--- a/src/rw_sdl.c
+++ b/src/rw_sdl.c
@@ -497,7 +497,7 @@ int GLimp_Init( void *hInstance, void *wndProc )
 
 static void SetSDLIcon(void)
 {
-#include "q2icon.xbm"
+#include "../pixmaps/q2icon.xbm"
 	SDL_Surface	   *icon;
 	SDL_Color		color;
 	Uint8		   *ptr;
diff --git a/src/rw_x11.c b/src/rw_x11.c
index 90c5f00..9e01ff2 100644
--- a/src/rw_x11.c
+++ b/src/rw_x11.c
@@ -1079,7 +1079,7 @@ static qboolean SWimp_InitGraphics( qboolean fullscreen )
 		
 		wmhints = XAllocWMHints();
 		if (wmhints) {
-			#include "q2icon.xbm"
+			#include "../pixmaps/q2icon.xbm"
 
 			Pixmap icon_pixmap, icon_mask;
 			unsigned long fg, bg;