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.

[originally from svn r7339]

diff --git a/blackbox.R b/blackbox.R
index 20504ad0b43409c47e32460a6c44fcf52bee1006..45d2a2f83ee767e8b6ac783cacf13d1ca9ee00c0 100644 (file)
--- 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 519f4aba428e2ed6e167367d6343b671b7484c6b..cbf4369d39fab982bad5399cb922f483d721c448 100644 (file)
--- 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 276510efff3c01f41952c66b470c80837c88c22e..0ba4902dcd6fc0b1958e7d0cb527c1b500ac2785 100644 (file)
--- 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 4fe065af3d5cbea9093bff8910a2b264ff3d3a3a..ec106dfa179ac699c66aeaab72e31a8f1ecc8270 100644 (file)
--- 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 ba0c9ebf11a8e4f5e099fccffc9777e1ef36822f..cf49445bf60ab5fea282c839440cbce321819bf4 100644 (file)
--- 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 265859b2a4637b771f59ade959557fe656bfb521..4717ef82b0c32ec4d0bde5e083c7c181ad15710d 100644 (file)
--- 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 66dc2e200e7e4bafba76b78f25d17b84e795ec9f..0b14f3a4f399247f4ca1e751fab1308dae901665 100644 (file)
--- 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 a0f0e43f8e1ae873a5681b7936883cd2dcc8168b..2babf89f8cd4d798db847feb7780a901124dfd62 100644 (file)
--- 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 8bc46559e5e9fc5aa3231462a33cdd5cecdf7afd..7107404176d5b2e61f2854b7def99b6f1bb27d93 100644 (file)
--- 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 b82870c3230983d21d25f07875ba60507d6c095f..b3e23a128bbd40eb2a5b76553db6c2fcdc2ed073 100644 (file)
--- 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 aa7eab5e586f21d3d5a68c540f987d180b4347bf..b7d2f2bad7427b5a5e097862c2034338d23b73af 100644 (file)
--- 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 7c19d45610aedbd4419de681b43507fa306ffb24..9131c5679c03366240317239100230e38bc6db67 100644 (file)
--- 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 11b518f9183e3e790d8475db37383e96e12d9106..aa7f11e0b91f6540fa3e972da49bd5744ca9fdc4 100644 (file)
--- 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 e51988a4e99d08ab2d3dffa22ea0e46c359df5f4..3d48182f2d57c50de128e398925df808c961058f 100644 (file)
--- 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 e184546d1a0c58257729466abcb79b1f6be47a05..9c5d05a8115e0174fa6062f6151e32c9bafb58c5 100644 (file)
--- 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 54a67067cc6f20aafcb3b1c91cf5055071dc1c4d..01edbeb0c3df37feba596fae3007ca399d9e7aea 100644 (file)
--- 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 (file)
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 721d19cef8e72b0068706db00e4a6d6d75e7b70c..41bdb85d57a8b97d9b5ee1311f6a9bf5c3aa55c3 100644 (file)
--- 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 0c05bbdd59ca99b49ce875ffb9d446e0d8a95911..7e1c964f54619e504915bcd299a467b78eec92a3 100644 (file)
--- 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 ff99cb538d8203481df6cfb548f49ba2cebe53c5..7dbddf5fa1d071fe791fde7815e030814389acc3 100644 (file)
--- 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 8250376be12a09c93e4643c5c5acad1780b75d62..559714fd9ddac2d34d3964a6d2e7e9fa92b4bc2f 100644 (file)
--- 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 9e90b2c96999f4d80fae0bb5d696b696fdc6acaa..5b1f7633298dcf19ce3a2efa04bbd1f84b5a4aad 100644 (file)
--- 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 9935ced225ae51065385fb18e2c314b80f86b968..8463da58b4d0b161c87c31163331c6ff08002d6c 100644 (file)
--- 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 9c4d5756e2189ca77ff2847aa3ae6156388000e8..fb5653d237394994ff305f2c4920c87e2101b2af 100644 (file)
--- 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 8a5c52dec7a60df9d5c3b3b3ac921e732484c9b0..fed81040edc05062c39db9a410fb08ad50035fca 100644 (file)
--- 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 a41780ffedcec7e068f09ba7c56348785b3fa9be..0079c5b21792db209260e8ebc9d01a592aa0fdf4 100644 (file)
--- 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 2b8897e15675e97357dec4b6b8ef5020f2582c21..5be9bdc2f077655a32d17a45e902308f0a07d0eb 100644 (file)
--- 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 5083857dbeec5e5d25f1bcc8dd26408f7e3d0522..014440ec1e3df039eb453ac3320d3bb1a475b842 100644 (file)
--- 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 f7a786742170bca8c31cb38517e67d65778d1b0a..5943295488a8edf9fef41e0745b001d8c6d54774 100644 (file)
--- 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