From 0d6131ed290b7c6b67033b303a858a647834ad4d Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Mon, 16 Sep 2002 23:47:30 +0000 Subject: [PATCH] - Fixed paths to the icon data. - Added Makefile to distribute the pixmaps. --- Makefile.am | 2 +- configure.in | 1 + data/Makefile.am | 2 +- src/gl_glx.c | 2 +- src/rw_sdl.c | 2 +- src/rw_x11.c | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 82a8578..3ffd006 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,4 +4,4 @@ SUBDIRS = libltdl src data EXTRA_DIST = quake2.dsp quake2.dsw quake2.mak \ HACKING \ - baseq2 bsd docs irix null pixmaps rhapsody solaris win32 + baseq2 bsd docs irix null rhapsody solaris win32 diff --git a/configure.in b/configure.in index 70cbe97..20ef428 100644 --- a/configure.in +++ b/configure.in @@ -424,6 +424,7 @@ AC_CONFIG_FILES([ src/xatrix/Makefile src/rogue/Makefile data/Makefile + data/pixmaps/Makefile data/baseq2/Makefile ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index 1d1b682..8eebe7f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,3 @@ # $Id$ -SUBDIRS = baseq2 +SUBDIRS = baseq2 pixmaps diff --git a/src/gl_glx.c b/src/gl_glx.c index bad173b..059a0f6 100644 --- a/src/gl_glx.c +++ b/src/gl_glx.c @@ -885,7 +885,7 @@ int GLimp_SetMode( unsigned int *pwidth, unsigned int *pheight, int mode, qboole wmhints = XAllocWMHints(); if (wmhints) { - #include "../pixmaps/q2icon.xbm" +#include "../data/pixmaps/q2icon.xbm" Pixmap icon_pixmap, icon_mask; unsigned long fg, bg; diff --git a/src/rw_sdl.c b/src/rw_sdl.c index 3479980..411c93a 100644 --- a/src/rw_sdl.c +++ b/src/rw_sdl.c @@ -507,7 +507,7 @@ int GLimp_Init( void *hInstance, void *wndProc ) static void SetSDLIcon(void) { -#include "../pixmaps/q2icon.xbm" +#include "../data/pixmaps/q2icon.xbm" SDL_Surface *icon; SDL_Color color; Uint8 *ptr; diff --git a/src/rw_x11.c b/src/rw_x11.c index 493e40d..08b7344 100644 --- a/src/rw_x11.c +++ b/src/rw_x11.c @@ -1081,7 +1081,7 @@ static qboolean SWimp_InitGraphics( qboolean fullscreen ) wmhints = XAllocWMHints(); if (wmhints) { - #include "../pixmaps/q2icon.xbm" +#include "../data/pixmaps/q2icon.xbm" Pixmap icon_pixmap, icon_mask; unsigned long fg, bg;