From: Holger Schemel <info@artsoft.org>
Date: Sat, 5 Nov 2022 16:16:05 +0000 (+0100)
Subject: added project files for Windows platform
X-Git-Tag: 4.3.3.0~25
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=4867b769fb4ce52d71200bb147bfa511cb84cc9c;p=rocksndiamonds.git

added project files for Windows platform
---

diff --git a/build-projects/windows/icons/icon-128x128.png b/build-projects/windows/icons/icon-128x128.png
new file mode 100644
index 00000000..a64af198
Binary files /dev/null and b/build-projects/windows/icons/icon-128x128.png differ
diff --git a/build-projects/windows/icons/icon-16x16.png b/build-projects/windows/icons/icon-16x16.png
new file mode 100644
index 00000000..876448b8
Binary files /dev/null and b/build-projects/windows/icons/icon-16x16.png differ
diff --git a/build-projects/windows/icons/icon-32x32.png b/build-projects/windows/icons/icon-32x32.png
new file mode 100644
index 00000000..dcd51125
Binary files /dev/null and b/build-projects/windows/icons/icon-32x32.png differ
diff --git a/build-projects/windows/icons/icon-48x48.png b/build-projects/windows/icons/icon-48x48.png
new file mode 100644
index 00000000..bf6274bc
Binary files /dev/null and b/build-projects/windows/icons/icon-48x48.png differ
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)