X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2Fbuild-fntable.pl;h=c93343cf747a0fded5dcdfcdb93f4daac67637f4;hb=refs%2Fheads%2Fmaster;hp=4ac4affacceec4eac997518fd9708277cb840154;hpb=d5186197bc394e10a4402f7f6d23fbb14103bc50;p=xscreensaver

diff --git a/OSX/build-fntable.pl b/OSX/build-fntable.pl
index 4ac4affa..c93343cf 100755
--- a/OSX/build-fntable.pl
+++ b/OSX/build-fntable.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2012-2014 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2012-2018 Jamie Zawinski <jwz@jwz.org>
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -23,7 +23,7 @@ require 5;
 use strict;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my ($version) = ('$Revision: 1.3 $' =~ m/\s(\d[.\d]+)\s/s);
+my ($version) = ('$Revision: 1.6 $' =~ m/\s(\d[.\d]+)\s/s);
 
 my $verbose = 1;
 
@@ -31,16 +31,18 @@ my $verbose = 1;
 #
 my %disable = (
    'extrusion'		=> 1,
+   'glitchpeg'		=> 1,
    'lcdscrub'		=> 1,
    'lockward'		=> 1,
    'webcollage'		=> 1,
+   'testx11'		=> 1,
   );
 
 # Parse the RETIRED_EXES variable from the Makefiles to populate %disable.
 # Duplicated in ../hacks/munge-ad.pl.
 #
 sub parse_makefiles() {
-  foreach my $mf ( "hacks/Makefile.in", "hacks/glx/Makefile.in" ) {
+  foreach my $mf ( "../hacks/Makefile.in", "../hacks/glx/Makefile.in" ) {
     open (my $in, '<', $mf) || error ("$mf: $!");
     print STDERR "$progname: reading $mf\n" if ($verbose > 1);
     local $/ = undef;  # read entire file
@@ -102,8 +104,8 @@ sub build_h($) {
               "\n");
 
   $body .= "extern struct $suf";
-  foreach my $s (@names) {
-    $body .= "\n *${s}_${suf},";
+  foreach my $s (@names, 'testx11') {
+    $body .= "\n ${s}_${suf},";
   }
   $body =~ s/,\s*$/;/s;
 
@@ -120,6 +122,8 @@ sub build_h($) {
             " " . line('apple2', $suf) .
             "#elif defined(PHOSPHOR_ONLY)\n" .
             " " . line('phosphor', $suf) .
+            "#elif defined(TESTX11_ONLY)\n" .
+            " " . line('testx11', $suf) .
             "#else\n");
   foreach my $s (@names) { $body .= line($s, $suf); }
   $body .= ("#endif\n" .