From 37a0c1af6a8b6d4f9ab2ab2adb3218b44bc64a04 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 27 Apr 2005 19:39:20 +0000 Subject: 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] --- mkfiles.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mkfiles.pl') diff --git a/mkfiles.pl b/mkfiles.pl index 78a8b8e..afacbba 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -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", -- cgit v1.1