Patches for GTK 2. Puzzles already _built_ under GTK 2, but now it

builds better:
 - the GTK makefile now defines $(GTK_CONFIG) which you can
   override, so you can build for GTK 2 with no makefile-editing
   simply by running `make GTK_CONFIG="pkg_config gtk+-2.0"'
 - we use Pango to find appropriate fonts, which means the text in
   the puzzles actually (gasp!) adapts its size to the
   circumstances. Unfortunately, I've been unable to do this
   portably without depending on _either_ a Pango function that
   isn't present in older versions _or_ the underlying window system
   being X11; I'd appreciate someone doing better.

[originally from svn r5693]
This commit is contained in:
Simon Tatham
2005-04-27 19:39:20 +00:00
parent 8b31b4606c
commit 37a0c1af6a
2 changed files with 59 additions and 5 deletions

View File

@ -874,11 +874,12 @@ if (defined $makefiles{'gtk'}) {
"# You can define this path to point at your tools if you need to\n".
"# TOOLPATH = /opt/gcc/bin\n".
"CC = \$(TOOLPATH)cc\n".
"GTK_CONFIG = gtk-config\n".
"\n".
&splitline("CFLAGS = -O2 -Wall -Werror -g " .
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
" `gtk-config --cflags`")."\n".
"XLDFLAGS = `gtk-config --libs`\n".
" `\$(GTK_CONFIG) --cflags`")."\n".
"XLDFLAGS = `\$(GTK_CONFIG) --libs`\n".
"ULDFLAGS =#\n".
"INSTALL=install\n",
"INSTALL_PROGRAM=\$(INSTALL)\n",