From 7a4c7e323d9a23433c9e7b23a68984dc4f8cbb3e Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Tue, 27 Feb 2007 20:49:40 +0000
Subject: [PATCH] Create a blank .rc file to be used in the absence of
 icons/foo.rc. This means that puzzles.rc2 is always included in all Windows
 and PocketPC builds, which in turn means that I should be able to start
 filling it full of VERSIONINFO and have that reliably included as well.

git-svn-id: svn://svn.tartarus.org/sgt/puzzles@7339 cda61777-01e9-0310-a592-d414129be87e
---
 blackbox.R | 2 +-
 bridges.R  | 2 +-
 cube.R     | 2 +-
 dominosa.R | 2 +-
 fifteen.R  | 2 +-
 filling.R  | 2 +-
 flip.R     | 2 +-
 galaxies.R | 2 +-
 guess.R    | 2 +-
 inertia.R  | 2 +-
 lightup.R  | 2 +-
 loopy.R    | 2 +-
 map.R      | 2 +-
 mines.R    | 2 +-
 net.R      | 2 +-
 netslide.R | 2 +-
 noicon.rc  | 3 +++
 nullgame.R | 2 +-
 pattern.R  | 2 +-
 pegs.R     | 2 +-
 rect.R     | 2 +-
 samegame.R | 2 +-
 sixteen.R  | 2 +-
 slant.R    | 2 +-
 solo.R     | 2 +-
 tents.R    | 2 +-
 twiddle.R  | 2 +-
 unequal.R  | 2 +-
 untangle.R | 2 +-
 29 files changed, 31 insertions(+), 28 deletions(-)
 create mode 100644 noicon.rc

diff --git a/blackbox.R b/blackbox.R
index 20504ad..45d2a2f 100644
--- a/blackbox.R
+++ b/blackbox.R
@@ -2,7 +2,7 @@
 
 blackbox : [X] GTK COMMON blackbox blackbox-icon|no-icon
 
-blackbox : [G] WINDOWS COMMON blackbox blackbox.res?
+blackbox : [G] WINDOWS COMMON blackbox blackbox.res|noicon.res
 
 ALL += blackbox
 
diff --git a/bridges.R b/bridges.R
index 519f4ab..cbf4369 100644
--- a/bridges.R
+++ b/bridges.R
@@ -4,7 +4,7 @@ BRIDGES  = bridges dsf
 
 bridges  : [X] GTK COMMON BRIDGES bridges-icon|no-icon
 
-bridges  : [G] WINDOWS COMMON BRIDGES bridges.res?
+bridges  : [G] WINDOWS COMMON BRIDGES bridges.res|noicon.res
 
 ALL += BRIDGES
 
diff --git a/cube.R b/cube.R
index 276510e..0ba4902 100644
--- a/cube.R
+++ b/cube.R
@@ -2,7 +2,7 @@
 
 cube     : [X] GTK COMMON cube cube-icon|no-icon
 
-cube     : [G] WINDOWS COMMON cube cube.res?
+cube     : [G] WINDOWS COMMON cube cube.res|noicon.res
 
 ALL += cube
 
diff --git a/dominosa.R b/dominosa.R
index 4fe065a..ec106df 100644
--- a/dominosa.R
+++ b/dominosa.R
@@ -2,7 +2,7 @@
 
 dominosa : [X] GTK COMMON dominosa dominosa-icon|no-icon
 
-dominosa : [G] WINDOWS COMMON dominosa dominosa.res?
+dominosa : [G] WINDOWS COMMON dominosa dominosa.res|noicon.res
 
 ALL += dominosa
 
diff --git a/fifteen.R b/fifteen.R
index ba0c9eb..cf49445 100644
--- a/fifteen.R
+++ b/fifteen.R
@@ -2,7 +2,7 @@
 
 fifteen  : [X] GTK COMMON fifteen fifteen-icon|no-icon
 
-fifteen  : [G] WINDOWS COMMON fifteen fifteen.res?
+fifteen  : [G] WINDOWS COMMON fifteen fifteen.res|noicon.res
 
 ALL += fifteen
 
diff --git a/filling.R b/filling.R
index 265859b..4717ef8 100644
--- a/filling.R
+++ b/filling.R
@@ -7,7 +7,7 @@ fillingsolver :	[C] filling[STANDALONE_SOLVER] dsf STANDALONE
 
 filling : [X] GTK COMMON FILLING filling-icon|no-icon
 
-filling : [G] WINDOWS COMMON FILLING filling.res?
+filling : [G] WINDOWS COMMON FILLING filling.res|noicon.res
 
 ALL += filling
 
diff --git a/flip.R b/flip.R
index 66dc2e2..0b14f3a 100644
--- a/flip.R
+++ b/flip.R
@@ -4,7 +4,7 @@ FLIP     = flip tree234
 
 flip     : [X] GTK COMMON FLIP flip-icon|no-icon
 
-flip     : [G] WINDOWS COMMON FLIP flip.res?
+flip     : [G] WINDOWS COMMON FLIP flip.res|noicon.res
 
 ALL += FLIP
 
diff --git a/galaxies.R b/galaxies.R
index a0f0e43..2babf89 100644
--- a/galaxies.R
+++ b/galaxies.R
@@ -4,7 +4,7 @@ GALAXIES = galaxies dsf
 
 galaxies : [X] GTK COMMON GALAXIES galaxies-icon|no-icon
 
-galaxies : [G] WINDOWS COMMON GALAXIES galaxies.res?
+galaxies : [G] WINDOWS COMMON GALAXIES galaxies.res|noicon.res
 
 galaxiessolver : [U] galaxies[STANDALONE_SOLVER] dsf STANDALONE m.lib
 galaxiessolver : [C] galaxies[STANDALONE_SOLVER] dsf STANDALONE
diff --git a/guess.R b/guess.R
index 8bc4655..7107404 100644
--- a/guess.R
+++ b/guess.R
@@ -2,7 +2,7 @@
 
 guess    : [X] GTK COMMON guess guess-icon|no-icon
 
-guess    : [G] WINDOWS COMMON guess guess.res?
+guess    : [G] WINDOWS COMMON guess guess.res|noicon.res
 
 ALL += guess
 
diff --git a/inertia.R b/inertia.R
index b82870c..b3e23a1 100644
--- a/inertia.R
+++ b/inertia.R
@@ -2,7 +2,7 @@
 
 inertia  : [X] GTK COMMON inertia inertia-icon|no-icon
 
-inertia  : [G] WINDOWS COMMON inertia inertia.res?
+inertia  : [G] WINDOWS COMMON inertia inertia.res|noicon.res
 
 ALL += inertia
 
diff --git a/lightup.R b/lightup.R
index aa7eab5..b7d2f2b 100644
--- a/lightup.R
+++ b/lightup.R
@@ -4,7 +4,7 @@ LIGHTUP  = lightup combi
 
 lightup  : [X] GTK COMMON LIGHTUP lightup-icon|no-icon
 
-lightup  : [G] WINDOWS COMMON LIGHTUP lightup.res?
+lightup  : [G] WINDOWS COMMON LIGHTUP lightup.res|noicon.res
 
 lightupsolver : [U] lightup[STANDALONE_SOLVER] combi STANDALONE
 lightupsolver : [C] lightup[STANDALONE_SOLVER] combi STANDALONE
diff --git a/loopy.R b/loopy.R
index 7c19d45..9131c56 100644
--- a/loopy.R
+++ b/loopy.R
@@ -4,7 +4,7 @@ LOOPY    = loopy tree234 dsf
 
 loopy    : [X] GTK COMMON LOOPY loopy-icon|no-icon
 
-loopy    : [G] WINDOWS COMMON LOOPY loopy.res?
+loopy    : [G] WINDOWS COMMON LOOPY loopy.res|noicon.res
 
 ALL += LOOPY
 
diff --git a/map.R b/map.R
index 11b518f..aa7f11e 100644
--- a/map.R
+++ b/map.R
@@ -4,7 +4,7 @@ MAP      = map dsf
 
 map      : [X] GTK COMMON MAP map-icon|no-icon
 
-map      : [G] WINDOWS COMMON MAP map.res?
+map      : [G] WINDOWS COMMON MAP map.res|noicon.res
 
 mapsolver :     [U] map[STANDALONE_SOLVER] dsf STANDALONE m.lib
 mapsolver :     [C] map[STANDALONE_SOLVER] dsf STANDALONE
diff --git a/mines.R b/mines.R
index e51988a..3d48182 100644
--- a/mines.R
+++ b/mines.R
@@ -4,7 +4,7 @@ MINES    = mines tree234
 
 mines    : [X] GTK COMMON MINES mines-icon|no-icon
 
-mines    : [G] WINDOWS COMMON MINES mines.res?
+mines    : [G] WINDOWS COMMON MINES mines.res|noicon.res
 
 mineobfusc :    [U] mines[STANDALONE_OBFUSCATOR] tree234 STANDALONE
 mineobfusc :    [C] mines[STANDALONE_OBFUSCATOR] tree234 STANDALONE
diff --git a/net.R b/net.R
index e184546..9c5d05a 100644
--- a/net.R
+++ b/net.R
@@ -6,7 +6,7 @@ net      : [X] GTK COMMON NET net-icon|no-icon
 
 # The Windows Net shouldn't be called `net.exe' since Windows
 # already has a reasonably important utility program by that name!
-netgame  : [G] WINDOWS COMMON NET net.res?
+netgame  : [G] WINDOWS COMMON NET net.res|noicon.res
 
 ALL += NET
 
diff --git a/netslide.R b/netslide.R
index 54a6706..01edbeb 100644
--- a/netslide.R
+++ b/netslide.R
@@ -4,7 +4,7 @@ NETSLIDE = netslide tree234
 
 netslide : [X] GTK COMMON NETSLIDE netslide-icon|no-icon
 
-netslide : [G] WINDOWS COMMON NETSLIDE netslide.res?
+netslide : [G] WINDOWS COMMON NETSLIDE netslide.res|noicon.res
 
 ALL += NETSLIDE
 
diff --git a/noicon.rc b/noicon.rc
new file mode 100644
index 0000000..26a70db
--- /dev/null
+++ b/noicon.rc
@@ -0,0 +1,3 @@
+/* Puzzle resource file without an icon, used in the absence of icons/foo.rc */
+
+#include "puzzles.rc2"
diff --git a/nullgame.R b/nullgame.R
index 721d19c..41bdb85 100644
--- a/nullgame.R
+++ b/nullgame.R
@@ -9,4 +9,4 @@
 # ever fails to compile, so it's important that it should actually
 # be built on a regular basis.
 nullgame : [X] GTK COMMON nullgame nullgame-icon|no-icon
-nullgame : [G] WINDOWS COMMON nullgame nullgame.res?
+nullgame : [G] WINDOWS COMMON nullgame nullgame.res|noicon.res
diff --git a/pattern.R b/pattern.R
index 0c05bbd..7e1c964 100644
--- a/pattern.R
+++ b/pattern.R
@@ -2,7 +2,7 @@
 
 pattern  : [X] GTK COMMON pattern pattern-icon|no-icon
 
-pattern  : [G] WINDOWS COMMON pattern pattern.res?
+pattern  : [G] WINDOWS COMMON pattern pattern.res|noicon.res
 
 patternsolver : [U] pattern[STANDALONE_SOLVER] STANDALONE
 patternsolver : [C] pattern[STANDALONE_SOLVER] STANDALONE
diff --git a/pegs.R b/pegs.R
index ff99cb5..7dbddf5 100644
--- a/pegs.R
+++ b/pegs.R
@@ -4,7 +4,7 @@ PEGS     = pegs tree234
 
 pegs     : [X] GTK COMMON PEGS pegs-icon|no-icon
 
-pegs     : [G] WINDOWS COMMON PEGS pegs.res?
+pegs     : [G] WINDOWS COMMON PEGS pegs.res|noicon.res
 
 ALL += PEGS
 
diff --git a/rect.R b/rect.R
index 8250376..559714f 100644
--- a/rect.R
+++ b/rect.R
@@ -2,7 +2,7 @@
 
 rect     : [X] GTK COMMON rect rect-icon|no-icon
 
-rect     : [G] WINDOWS COMMON rect rect.res?
+rect     : [G] WINDOWS COMMON rect rect.res|noicon.res
 
 ALL += rect
 
diff --git a/samegame.R b/samegame.R
index 9e90b2c..5b1f763 100644
--- a/samegame.R
+++ b/samegame.R
@@ -2,7 +2,7 @@
 
 samegame : [X] GTK COMMON samegame samegame-icon|no-icon
 
-samegame : [G] WINDOWS COMMON samegame samegame.res?
+samegame : [G] WINDOWS COMMON samegame samegame.res|noicon.res
 
 ALL += samegame
 
diff --git a/sixteen.R b/sixteen.R
index 9935ced..8463da5 100644
--- a/sixteen.R
+++ b/sixteen.R
@@ -2,7 +2,7 @@
 
 sixteen  : [X] GTK COMMON sixteen sixteen-icon|no-icon
 
-sixteen  : [G] WINDOWS COMMON sixteen sixteen.res?
+sixteen  : [G] WINDOWS COMMON sixteen sixteen.res|noicon.res
 
 ALL += sixteen
 
diff --git a/slant.R b/slant.R
index 9c4d575..fb5653d 100644
--- a/slant.R
+++ b/slant.R
@@ -4,7 +4,7 @@ SLANT    = slant dsf
 
 slant    : [X] GTK COMMON SLANT slant-icon|no-icon
 
-slant    : [G] WINDOWS COMMON SLANT slant.res?
+slant    : [G] WINDOWS COMMON SLANT slant.res|noicon.res
 
 slantsolver :   [U] slant[STANDALONE_SOLVER] dsf STANDALONE
 slantsolver :   [C] slant[STANDALONE_SOLVER] dsf STANDALONE
diff --git a/solo.R b/solo.R
index 8a5c52d..fed8104 100644
--- a/solo.R
+++ b/solo.R
@@ -2,7 +2,7 @@
 
 solo     : [X] GTK COMMON solo solo-icon|no-icon
 
-solo     : [G] WINDOWS COMMON solo solo.res?
+solo     : [G] WINDOWS COMMON solo solo.res|noicon.res
 
 solosolver :    [U] solo[STANDALONE_SOLVER] STANDALONE
 solosolver :    [C] solo[STANDALONE_SOLVER] STANDALONE
diff --git a/tents.R b/tents.R
index a41780f..0079c5b 100644
--- a/tents.R
+++ b/tents.R
@@ -4,7 +4,7 @@ TENTS    = tents maxflow
 
 tents    : [X] GTK COMMON TENTS tents-icon|no-icon
 
-tents    : [G] WINDOWS COMMON TENTS tents.res?
+tents    : [G] WINDOWS COMMON TENTS tents.res|noicon.res
 
 ALL += TENTS
 
diff --git a/twiddle.R b/twiddle.R
index 2b8897e..5be9bdc 100644
--- a/twiddle.R
+++ b/twiddle.R
@@ -2,7 +2,7 @@
 
 twiddle  : [X] GTK COMMON twiddle twiddle-icon|no-icon
 
-twiddle  : [G] WINDOWS COMMON twiddle twiddle.res?
+twiddle  : [G] WINDOWS COMMON twiddle twiddle.res|noicon.res
 
 ALL += twiddle
 
diff --git a/unequal.R b/unequal.R
index 5083857..014440e 100644
--- a/unequal.R
+++ b/unequal.R
@@ -4,7 +4,7 @@ UNEQUAL  = unequal latin tree234 maxflow
 
 unequal  : [X] GTK COMMON UNEQUAL unequal-icon|no-icon
 
-unequal  : [G] WINDOWS COMMON UNEQUAL unequal.res?
+unequal  : [G] WINDOWS COMMON UNEQUAL unequal.res|noicon.res
 
 unequalsolver : [U] unequal[STANDALONE_SOLVER] latin[STANDALONE_SOLVER] tree234 maxflow STANDALONE
 unequalsolver : [C] unequal[STANDALONE_SOLVER] latin[STANDALONE_SOLVER] tree234 maxflow STANDALONE
diff --git a/untangle.R b/untangle.R
index f7a7867..5943295 100644
--- a/untangle.R
+++ b/untangle.R
@@ -4,7 +4,7 @@ UNTANGLE = untangle tree234
 
 untangle : [X] GTK COMMON UNTANGLE untangle-icon|no-icon
 
-untangle : [G] WINDOWS COMMON UNTANGLE untangle.res?
+untangle : [G] WINDOWS COMMON UNTANGLE untangle.res|noicon.res
 
 ALL += UNTANGLE
 
-- 
2.11.0