ref: 1dc3ce6d90c75f1a6b2e19cdaf5a3c0f92aaac05
parent: 650929a57fb5f075c6bfe17c351e672839744ca8
author: Simon Tatham <[email protected]>
date: Tue Feb 27 15:49:40 EST 2007
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]
--- 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
--- a/bridges.R
+++ b/bridges.R
@@ -4,7 +4,7 @@
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
--- 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
--- 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
--- 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
--- a/filling.R
+++ b/filling.R
@@ -7,7 +7,7 @@
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
--- a/flip.R
+++ b/flip.R
@@ -4,7 +4,7 @@
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
--- a/galaxies.R
+++ b/galaxies.R
@@ -4,7 +4,7 @@
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
--- 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
--- 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
--- a/lightup.R
+++ b/lightup.R
@@ -4,7 +4,7 @@
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
--- a/loopy.R
+++ b/loopy.R
@@ -4,7 +4,7 @@
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
--- a/map.R
+++ b/map.R
@@ -4,7 +4,7 @@
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
--- a/mines.R
+++ b/mines.R
@@ -4,7 +4,7 @@
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
--- a/net.R
+++ b/net.R
@@ -6,7 +6,7 @@
# 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
--- a/netslide.R
+++ b/netslide.R
@@ -4,7 +4,7 @@
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
--- /dev/null
+++ b/noicon.rc
@@ -1,0 +1,3 @@
+/* Puzzle resource file without an icon, used in the absence of icons/foo.rc */
+
+#include "puzzles.rc2"
--- 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
--- 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
--- a/pegs.R
+++ b/pegs.R
@@ -4,7 +4,7 @@
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
--- 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
--- 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
--- 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
--- a/slant.R
+++ b/slant.R
@@ -4,7 +4,7 @@
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
--- 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
--- a/tents.R
+++ b/tents.R
@@ -4,7 +4,7 @@
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
--- 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
--- a/unequal.R
+++ b/unequal.R
@@ -4,7 +4,7 @@
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
--- a/untangle.R
+++ b/untangle.R
@@ -4,7 +4,7 @@
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