From 44face3d707fd8af4766a011c06b4d9dbb16b7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Sat, 26 Mar 2011 23:33:44 +0100 Subject: [PATCH] Moved windows ico file and nsis installer to win32 subdir --- {contrib => src/win32}/stratagus.ico | Bin stratagus.nsi => src/win32/stratagus.nsi | 2 +- src/win32/stratagus.rc | 7 +++++-- 3 files changed, 6 insertions(+), 3 deletions(-) rename {contrib => src/win32}/stratagus.ico (100%) rename stratagus.nsi => src/win32/stratagus.nsi (99%) diff --git a/contrib/stratagus.ico b/src/win32/stratagus.ico similarity index 100% rename from contrib/stratagus.ico rename to src/win32/stratagus.ico diff --git a/stratagus.nsi b/src/win32/stratagus.nsi similarity index 99% rename from stratagus.nsi rename to src/win32/stratagus.nsi index 6b7f8d02f..78c3559eb 100644 --- a/stratagus.nsi +++ b/src/win32/stratagus.nsi @@ -31,7 +31,7 @@ ;-------------------------------- -!define ICON "contrib/stratagus.ico" +!define ICON "stratagus.ico" !define STRATAGUS "stratagus.exe" !define STRATAGUSDBG "stratagus-dbg.exe" !define UNINSTALL "uninstall.exe" diff --git a/src/win32/stratagus.rc b/src/win32/stratagus.rc index c5cfa19f3..f55a058e0 100644 --- a/src/win32/stratagus.rc +++ b/src/win32/stratagus.rc @@ -1,6 +1,9 @@ #include "include/version.h" -1 ICON "../contrib/stratagus.ico" +#define ICO "stratagus.ico" +#define EXE "stratagus.exe" + +1 ICON ICO 1 VERSIONINFO FILEVERSION StratagusMajorVersion,StratagusMinorVersion,StratagusPatchLevel,StratagusPatchLevel2 PRODUCTVERSION StratagusMajorVersion,StratagusMinorVersion,StratagusPatchLevel,StratagusPatchLevel2 @@ -22,7 +25,7 @@ BEGIN VALUE "LegalCopyright", COPYRIGHT VALUE "License", LICENSE VALUE "Homepage", HOMEPAGE - VALUE "OriginalFilename", "stratagus.exe" + VALUE "OriginalFilename", EXE VALUE "ProductName", NAME VALUE "ProductVersion", VERSION END