diff options
| author | TingPing <tingping@tingping.se> | 2013-09-29 02:24:30 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-09-29 02:24:30 -0400 |
| commit | 00bd389cdcd3e481c92de435e626a2618d4a128c (patch) | |
| tree | ed9852f20ab8dff18672b29eaccce05878251d38 /win32/installer | |
| parent | 4ba886f7aaf884c518637173be0b1d8e9b190e86 (diff) | |
| parent | 1f84c507a058f5baa01a632ce2478fa31854907d (diff) | |
Merge branch 'gresource'
Diffstat (limited to 'win32/installer')
| -rw-r--r-- | win32/installer/hexchat-x64.skel.iss | 5 | ||||
| -rw-r--r-- | win32/installer/hexchat-x86.skel.iss | 5 | ||||
| -rw-r--r-- | win32/installer/installer.vcxproj | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index 4155d55a..0febb611 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -4,7 +4,7 @@ AppPublisherURL=http://www.hexchat.org/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny AppSupportURL=https://github.com/hexchat/hexchat/issues AppUpdatesURL=http://www.hexchat.org/home/downloads -LicenseFile=share\doc\hexchat\COPYING +LicenseFile=COPYING UninstallDisplayIcon={app}\hexchat.exe UninstallDisplayName=HexChat (x64) DefaultDirName={pf}\HexChat @@ -86,8 +86,7 @@ Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme ;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs -Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs - +Source: "COPYING"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations Source: "atk-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss index 4d19b3b7..82e9cd31 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -4,7 +4,7 @@ AppPublisherURL=http://www.hexchat.org/ AppCopyright=Copyright (C) 1998-2010 Peter Zelezny AppSupportURL=https://github.com/hexchat/hexchat/issues AppUpdatesURL=http://www.hexchat.org/home/downloads -LicenseFile=share\doc\hexchat\COPYING +LicenseFile=COPYING UninstallDisplayIcon={app}\hexchat.exe UninstallDisplayName=HexChat (x86) DefaultDirName={pf}\HexChat @@ -85,8 +85,7 @@ Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme ;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs -Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs - +Source: "COPYING"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations Source: "atk-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj index 39a1cb90..0506b246 100644 --- a/win32/installer/installer.vcxproj +++ b/win32/installer/installer.vcxproj @@ -68,7 +68,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-x86.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-x86.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-x86.iss" -echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-x86.iss" +echo SetupIconFile="$(DataDir)icons\hexchat.ico" >> "$(OutDir)\hexchat-x86.iss" type hexchat-x86.skel.iss >> "$(OutDir)\hexchat-x86.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss"</Command> </PreBuildEvent> @@ -91,7 +91,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" >> "$(OutDi "$(OutDir)\version" -v >> "$(OutDir)\hexchat-x64.iss" "$(OutDir)\version" -i >> "$(OutDir)\hexchat-x64.iss" "$(OutDir)\version" -o >> "$(OutDir)\hexchat-x64.iss" -echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" >> "$(OutDir)\hexchat-x64.iss" +echo SetupIconFile="$(DataDir)icons\hexchat.ico" >> "$(OutDir)\hexchat-x64.iss" type hexchat-x64.skel.iss >> "$(OutDir)\hexchat-x64.iss" "$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss"</Command> </PreBuildEvent> @@ -105,4 +105,4 @@ type hexchat-x64.skel.iss >> "$(OutDir)\hexchat-x64.iss" <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> |