From 4867b769fb4ce52d71200bb147bfa511cb84cc9c Mon Sep 17 00:00:00 2001
From: Holger Schemel <info@artsoft.org>
Date: Sat, 5 Nov 2022 17:16:05 +0100
Subject: [PATCH] added project files for Windows platform

---
 build-projects/windows/icons/icon-128x128.png | Bin 0 -> 1710 bytes
 build-projects/windows/icons/icon-16x16.png   | Bin 0 -> 601 bytes
 build-projects/windows/icons/icon-32x32.png   | Bin 0 -> 1075 bytes
 build-projects/windows/icons/icon-48x48.png   | Bin 0 -> 1850 bytes
 build-projects/windows/rocksndiamonds.url     |   2 +
 build-projects/windows/template.iss           |  53 ++++++++++++++++++
 src/Makefile                                  |   7 +--
 7 files changed, 57 insertions(+), 5 deletions(-)
 create mode 100644 build-projects/windows/icons/icon-128x128.png
 create mode 100644 build-projects/windows/icons/icon-16x16.png
 create mode 100644 build-projects/windows/icons/icon-32x32.png
 create mode 100644 build-projects/windows/icons/icon-48x48.png
 create mode 100644 build-projects/windows/rocksndiamonds.url
 create mode 100644 build-projects/windows/template.iss

diff --git a/build-projects/windows/icons/icon-128x128.png b/build-projects/windows/icons/icon-128x128.png
new file mode 100644
index 0000000000000000000000000000000000000000..a64af1980bb2862cddfecd2c32abeff8402f06a4
GIT binary patch
literal 1710
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
Eg7LBJRsaA1

literal 0
HcmV?d00001

diff --git a/build-projects/windows/icons/icon-16x16.png b/build-projects/windows/icons/icon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..876448b839fe2fddd3d557106944c786bc2f4b55
GIT binary patch
literal 601
zcmV-f0;c_mP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&v#}5d_pNk4pdm0p>|W
zK~y-)jnmId)Ik`>@z<_fX>728hYm#sm78?%AYsr!sH9*!bt%fDorOFG5q9&^E&K-}
zk`B^WR61BG{n}tJfgKElq(Y0*G{1>D9rnBaHu^ja%nZ-x{me7Wu$_8jE`7b!tK^Gb
zx7<+czttl<GClINBXk7If)9ch7WBFAw){W6EkiB2;!JTQgb?aNT@b86-U(g``aN;a
zxh>{~;f4dnAH}f{LMVk&*<6W5!TSXAPViRnNJ&994Tb(feyDk9xGC3^he))Mz6-}u
zovi2aMx(4oov%7ij?IsK3G37xnm3-H5(|P+!A-#pL7VHD`a|`v@_X~yO0h|kUVFXu
zf@bgr{fLvjw7N|D<MwYKFMiB+9qW>jF=%kjw1NpdM+tv0owTwKX@{$vaddQQ^whww
z0j&pHb*H<H$K&N{4={jFSWd<)786LyY)Xd<P8fh(E+-a?i*Y$|v*wdlAcOrTQVOb_
zHEpk~-<ZPp9UjW}q>YMdNQ=Z`&%hjZBe#utWs{jX3$CWYtUkZ7v__WQ1lVXE$7zv=
zRp5xvQVP;)rIM6A32<q(US%HPyvQV0)62T5QLW4NxT3~Usif~ke6=LFBXW1WCAH(v
nx|YDIT=7%Rls3`&M^e^b?rYIOQACol00000NkvXXu0mjf&MXoW

literal 0
HcmV?d00001

diff --git a/build-projects/windows/icons/icon-32x32.png b/build-projects/windows/icons/icon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcd5112564f6dad53b82e5c52e19301ee5f67059
GIT binary patch
literal 1075
zcmV-31kC%1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&v#}5GQX@&v*a;1Hef{
zK~z}7y_Ugm+hiEVe{t3d=vFzj2gHR;2r*ScxVMQ@dg9_k_6MMa3)iU}#&OvNsS-%N
zp>av8F-?jD^M;E+h}Dq_E2t=8s?dZO1Pu+^($*!EW^0p|gTJJ<<2XqRyp|<9-{<dn
zzUO`3_X`Xfm(a)Wjh9(OxI%%~F!<l%3i`~0nQ~UL!U4kf2qlDh7I}m0e+&K=#?tmu
zSwut^T@Zv_gfhYk!dD2_`I$@PFwy_*og2lq;<kv$4Y}cgw=O@46@;%5Zn4cf<S|Jf
zAN&?Zamxc25y?p|NFa(t>;B}JKFNHR$=u($-v$>ENlUtuKpcscBl=|GqlsL3r|id;
zvXrC2Th||52&_c-M1>X!zBrM)_Ug5QF&b2Ep80szV-TD5Vc-SQJWB!7OG^iV{Axb8
z@XA8Lc&amP4o+|BdXe~6-6LcGPWZ>n1+#GB%!Qnu?5v_HRVq~a%imc0qiAq%>w18I
zdB-eVJ$p5$cPU{DYcL0o0X1MV0^CD>+2diN=U4Nw-~c5`gO^cS5eb8Pp#vl?-o03!
zd1)rLPF-A5qy__T01tsB;B#OoH2w&ec~V+&vuIQr@wpvH{>Q*K!27_v3VaJ_hUO(a
z1+?nzYIV|@WVSYYJo$eEJ_X(e=70*YrwBCwH#GkQU}7YAlL9Z2BMI3|mcsJ|!d^&`
z!tGc=E&da*46FjX5j))g_SN&#z!Sc)hfHbw%1s&`OX~}Z)6Qv}h7*v#1Kb6^R1&`j
z+)<8iM)+Vq^qqgsDKZ*GEH->|esG!kaEi<B<)Hix-~n)50e_(CydIO5N1^wo@`Epu
z0G!1j#hLc6b#U%Elunjd9$v=%&IKFz82C|1EqxfW1{_4FqN%prY&D{FN<2q4(3l(G
z+;-r1U|oGUNHk;AsU3PjQv@t(5ffXc(vEPJKkh+p3rLdjmbR&~6KeELML<*T9h5}9
z$N0YI5zXgNCvx{3kwm@c43`?`4ww9eo9&Wm?cN_lz~}(-H)Cg1fJtnuLjpDq>#E>)
zyDaczpCtBTN9TYkZ11oRiuxB;<nH}3qKF(#{%LGp$3E<ATBvQ7__L>c-a$GPW3EO-
zzCFo14xD7*?JgCbA;AG@H1w_@s5*|yb-kklw(?z#S|-sIz{DWMc}|k$6zNFW_alzl
zjX?jO#b!EA%tT+V_LI>`GaPdKrmxMewI!d%X0F%LiGe$uiNQGM86nH4BD1F;{{~#D
tz&Y&x{=p_VPWZ_rNVA5;UeM*e;valG)ow`u=uQ9t002ovPDHLkV1i<k^yUBn

literal 0
HcmV?d00001

diff --git a/build-projects/windows/icons/icon-48x48.png b/build-projects/windows/icons/icon-48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf6274bcc3e40046c38b9af97a73f452e610ff6a
GIT binary patch
literal 1850
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

literal 0
HcmV?d00001

diff --git a/build-projects/windows/rocksndiamonds.url b/build-projects/windows/rocksndiamonds.url
new file mode 100644
index 00000000..6eb96358
--- /dev/null
+++ b/build-projects/windows/rocksndiamonds.url
@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=https://www.artsoft.org/rocksndiamonds/
diff --git a/build-projects/windows/template.iss b/build-projects/windows/template.iss
new file mode 100644
index 00000000..5de94766
--- /dev/null
+++ b/build-projects/windows/template.iss
@@ -0,0 +1,53 @@
+; =============================================================================
+; template.iss
+; -----------------------------------------------------------------------------
+; configuration template for Inno Setup installation project
+;
+; 2020-06-30 info@artsoft.org
+; =============================================================================
+
+[Setup]
+AppName=_PRG_NAME_
+AppVerName=_PRG_NAME_ _PRG_VERSION_
+AppPublisher=Artsoft Entertainment
+AppPublisherURL=https://www.artsoft.org/
+AppSupportURL=https://www.artsoft.org/_PRG_BASENAME_/
+AppUpdatesURL=https://www.artsoft.org/_PRG_BASENAME_/
+
+ArchitecturesInstallIn64BitMode=_PRG_ARCH_
+ArchitecturesAllowed=_PRG_ARCH_
+
+DefaultDirName={pf}\_PRG_NAME_
+DefaultGroupName=_PRG_NAME_
+;LicenseFile="_PRG_DIR_\COPYING.txt"
+;InfoBeforeFile="_PRG_DIR_\INSTALL.txt"
+;InfoAfterFile="_PRG_DIR_\README.txt"
+UninstallDisplayIcon={app}\_PRG_EXE_
+Compression=lzma
+SolidCompression=yes
+
+OutputBaseFilename=_SETUP_EXE_
+OutputDir=.
+
+[Files]
+Source: "_PRG_DIR_\*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs ignoreversion
+
+[Tasks]
+Name: "desktopicon"; Description: "Create a &Desktop icon"; GroupDescription: "Additional icons:"
+Name: "quicklaunchicon"; Description: "Create a &Quick Launch icon"; GroupDescription: "Additional icons:"
+
+[Icons]
+Name: "{group}\_PRG_NAME_"; Filename: "{app}\_PRG_EXE_"
+Name: "{group}\_PRG_NAME_ on the Web"; Filename: "{app}\_PRG_BASENAME_.url"
+Name: "{userdesktop}\_PRG_NAME_"; Filename: "{app}\_PRG_EXE_"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\_PRG_NAME_"; Filename: "{app}\_PRG_EXE_"; Tasks: quicklaunchicon
+
+; This dynamically generates a Windows internet shortcut file. Unfortunately,
+; this file is not removed when the package is uninstalled, leaving an empty
+; program directory with just that internet shortcut file. Using a static file
+; does not cause this problem.
+;[INI]
+;Filename: "{app}\_PRG_BASENAME_.url"; Section: "InternetShortcut"; Key: "URL"; String: "https://www.artsoft.org/_PRG_BASENAME_/"
+
+[Run]
+Filename: "{app}\_PRG_EXE_"; Description: "Launch _PRG_NAME_"; Flags: nowait postinstall skipifsilent
diff --git a/src/Makefile b/src/Makefile
index 899bab0f..b7289d01 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -44,8 +44,6 @@ DEBUGGER = gdb -batch -ex "run" -ex "bt"
 PROGBASE = rocksndiamonds
 PROGNAME = ../$(PROGBASE)
 
-EDITION ?= default
-
 
 # -----------------------------------------------------------------------------
 # configuring platform
@@ -250,10 +248,10 @@ RNDLIBS = $(LIBGAME) $(GAME_EM) $(GAME_SP) $(GAME_MM)
 AUTOCONF = conf_gfx.h conf_snd.h conf_mus.h
 
 ICONBASE = windows_icon
-ICON_BASEPATH = ../Special/Icons/windows_icons
+ICON_BASEPATH = ../build-projects/windows/icons
 
 ifeq ($(PLATFORM_BASE),cross-win)
-ICON_PATH = $(ICON_BASEPATH)/$(EDITION)
+ICON_PATH = $(ICON_BASEPATH)
 ICON = $(ICONBASE).o
 endif
 
@@ -333,7 +331,6 @@ $(COMMIT_HASH_FILE): $(SRCS) $(RNDLIBS)
 	@$(MAKE) conf-hash
 
 $(ICON):
-#	$(CONVERT) $(ICON32X32) $(CONVERT_ICON_ARGS) $(ICONBASE).ico
 	$(CONVERT) $(ICON_PATH)/*.png $(CONVERT_ICON_ARGS) $(ICONBASE).ico
 	echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
 
-- 
2.34.1