Commit graph

22 commits

Author SHA1 Message Date
Dugan Chen
428027629c Install icons to PREFIX/share/icons/hicolor/128x128/apps 2017-12-09 15:37:37 -08:00
Fabian Greffrath
a28f58da05 Merge branch 'master' into sdl2-branch 2017-04-24 14:46:31 +02:00
Fabian Greffrath
429fa571c4 data/convert-icon: Support Pillow in addition to PIL 2017-04-24 10:27:26 +02:00
Simon Howard
1430facdb3 Merge branch 'master' into sdl2-branch
Conflicts:
	src/i_video.c
	src/setup/display.c
	textscreen/txt_sdl.c
2015-06-04 21:07:07 -04:00
Dave Murphy
d66659c606 allow building in subdirectory or outside source directory 2014-12-26 15:40:46 +00:00
Simon Howard
076c8400e6 Fix alpha channel for icons.
Tweak the convert-icon script to include the alpha channel value
as well as RGB. Fix i_video and the setup code to set the icon
including the alpha channel.

While we're at it, replace the current PNG icons with 128x128 high
quality versions so that they look nice on retina display Macs.
2014-12-06 01:54:36 -05:00
Simon Howard
7684ddcfd8 Clean up file headers.
This change rewrites and simplifies the copyright headers at the top
of all source files:

 * Remove "Emacs style mode select" line; this line was included in
   the headers for the originally released source files and appears
   to be to set the file type for old versions of Emacs. I'm not sure
   entirely why it was required but I don't think it is any more.
 * Remove "You should have received a copy of..." text from copyright
   header. This refers to the old 59 Temple Place address where the
   FSF headquarters used to be located and is no longer correct.
   Rather than change to the new address, just remove the paragraph
   as it is superfluous anyway. This fixes #311.
 * Remove ---- separator lines so that the file headers are barer
   and more simplified.
2014-05-05 00:20:54 -04:00
Fabian Greffrath
08ad5553fd Some improvements to the build system
1) Instead of copying chocolate-setup into chocolate-{doom,heretic,hexen,strife}-setup,
   respectively, check in configure for symbolic linking and use that if available
   (falls back to "cp -pR" if not).
2) Add $(icons_DATA) to CLEANFILES so they get removed in clean phase; they are
   generated from doom-png and setup.png, respectively.
3) Consistently use @PROGRAM_PREFIX@ instead of the hard-coded "chocolate-" in
   the rules for the man pages.
4) Generate one man page for each setup program by symbolic linking of
   chocolate-setup.6 (see 1), add them to the list of installed man pages and
   to CLEANFILES.
5) Remove the redundant $(EXEEXT) suffix from the setup binaries (they were missing
   for execgames_PROGRAMS, anyway)
2014-01-20 11:00:53 +01:00
Simon Howard
14b4789697 Remove use of $< in Makefiles, for compatibility with OpenBSD's make.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2473
2011-11-03 22:18:36 +00:00
Simon Howard
2e67fde263 Add clarification note about icon copyright status (thanks to Chris
Metcalf for clarification by email).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2358
2011-08-22 18:40:26 +00:00
Simon Howard
736082f2c0 Don't use $^ in Makefiles, as it s a GNU make extension (thanks Jakub
Lach).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2354
2011-07-21 14:21:57 +00:00
Simon Howard
d07b88e469 Add freedesktop.org desktop files for chocolate-doom, chocolate-setup
(thanks Adrián Chaves Fernández).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2337
2011-05-14 21:07:55 +00:00
Simon Howard
167d4df40b Update Python scripts to work in Python 3.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2162
2010-11-09 16:10:52 +00:00
Simon Howard
b5b2cea39c Fix poor quality application icons seen when the game is running.
Add back 8-bit icon files alongside files including both 8-bit and high
quality 32-bit versions. Use the high quality icon files for resource
files includes, and the low quality ones for in-game SDL.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1750
2009-12-18 22:11:06 +00:00
Simon Howard
ef736b3d42 Add Chocolate Doom/setup icons with scaled versions for various
different icon sizes (thanks MikeRS).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1746
2009-12-14 18:54:25 +00:00
Simon Howard
05ad516a0c "Python Image Library" -> "Python Imaging Library" (thanks exp(x)).
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1130
2008-04-26 16:31:47 +00:00
Simon Howard
3c0abe55d7 Add new Chocolate Doom icon.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1129
2008-04-26 14:33:14 +00:00
Simon Howard
092e2c4f3c Rename some files to be package name independent.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1024
2008-01-25 17:37:48 +00:00
Russell Rice
28e8f47bb1 make icons a little smoother around the edges
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 788
2006-12-18 23:40:40 +00:00
Simon Howard
2aa16d0ff3 Add icon for setup tool.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 777
2006-12-16 00:58:12 +00:00
Simon Howard
84d4d10702 Remove icon border
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 128
2005-09-24 23:16:43 +00:00
Simon Howard
f8d14bad71 Include icon in exe, rather than the default icon. Thanks to Joe Kennedy
for drawing this icon.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 115
2005-09-20 20:13:15 +00:00