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 (file)
index 0000000..a64af19
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 (file)
index 0000000..876448b
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 (file)
index 0000000..dcd5112
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 (file)
index 0000000..bf6274b
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 (file)
index 0000000..6eb9635
--- /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 (file)
index 0000000..5de9476
--- /dev/null
+++ b/build-projects/windows/template.iss
@@ -0,0 +1,53 @@
+; =============================================================================\r
+; template.iss\r
+; -----------------------------------------------------------------------------\r
+; configuration template for Inno Setup installation project\r
+;\r
+; 2020-06-30 info@artsoft.org\r
+; =============================================================================\r
+\r
+[Setup]\r
+AppName=_PRG_NAME_\r
+AppVerName=_PRG_NAME_ _PRG_VERSION_\r
+AppPublisher=Artsoft Entertainment\r
+AppPublisherURL=https://www.artsoft.org/\r
+AppSupportURL=https://www.artsoft.org/_PRG_BASENAME_/\r
+AppUpdatesURL=https://www.artsoft.org/_PRG_BASENAME_/\r
+\r
+ArchitecturesInstallIn64BitMode=_PRG_ARCH_\r
+ArchitecturesAllowed=_PRG_ARCH_\r
+\r
+DefaultDirName={pf}\_PRG_NAME_\r
+DefaultGroupName=_PRG_NAME_\r
+;LicenseFile="_PRG_DIR_\COPYING.txt"\r
+;InfoBeforeFile="_PRG_DIR_\INSTALL.txt"\r
+;InfoAfterFile="_PRG_DIR_\README.txt"\r
+UninstallDisplayIcon={app}\_PRG_EXE_\r
+Compression=lzma\r
+SolidCompression=yes\r
+\r
+OutputBaseFilename=_SETUP_EXE_\r
+OutputDir=.\r
+\r
+[Files]\r
+Source: "_PRG_DIR_\*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs ignoreversion\r
+\r
+[Tasks]\r
+Name: "desktopicon"; Description: "Create a &Desktop icon"; GroupDescription: "Additional icons:"\r
+Name: "quicklaunchicon"; Description: "Create a &Quick Launch icon"; GroupDescription: "Additional icons:"\r
+\r
+[Icons]\r
+Name: "{group}\_PRG_NAME_"; Filename: "{app}\_PRG_EXE_"\r
+Name: "{group}\_PRG_NAME_ on the Web"; Filename: "{app}\_PRG_BASENAME_.url"\r
+Name: "{userdesktop}\_PRG_NAME_"; Filename: "{app}\_PRG_EXE_"; Tasks: desktopicon\r
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\_PRG_NAME_"; Filename: "{app}\_PRG_EXE_"; Tasks: quicklaunchicon\r
+\r
+; This dynamically generates a Windows internet shortcut file. Unfortunately,\r
+; this file is not removed when the package is uninstalled, leaving an empty\r
+; program directory with just that internet shortcut file. Using a static file\r
+; does not cause this problem.\r
+;[INI]\r
+;Filename: "{app}\_PRG_BASENAME_.url"; Section: "InternetShortcut"; Key: "URL"; String: "https://www.artsoft.org/_PRG_BASENAME_/"\r
+\r
+[Run]\r
+Filename: "{app}\_PRG_EXE_"; Description: "Launch _PRG_NAME_"; Flags: nowait postinstall skipifsilent\r

diff --git a/src/Makefile b/src/Makefile
index 899bab0fb18506cb8d15e185bc42e5f48dd48ff6..b7289d01ddc7a8492dd83ef6729d2956120c35df 100644 (file)
--- 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)