mirror of
https://git.code.sf.net/p/quake/quake2forge
synced 2024-11-10 07:12:01 +00:00
- Fixed paths to the icon data.
- Added Makefile to distribute the pixmaps.
This commit is contained in:
parent
c5d9624daf
commit
0d6131ed29
6 changed files with 6 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -424,6 +424,7 @@ AC_CONFIG_FILES([
|
|||
src/xatrix/Makefile
|
||||
src/rogue/Makefile
|
||||
data/Makefile
|
||||
data/pixmaps/Makefile
|
||||
data/baseq2/Makefile
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
# $Id$
|
||||
|
||||
SUBDIRS = baseq2
|
||||
SUBDIRS = baseq2 pixmaps
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue