diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/deps-graph.txt | 27 | ||||
| -rw-r--r-- | win32/hexchat.props | 3 | ||||
| -rw-r--r-- | win32/hexchat.sln | 2 | ||||
| -rw-r--r-- | win32/installer/hexchat-x64.skel.iss | 6 | ||||
| -rw-r--r-- | win32/installer/hexchat-x86.skel.iss | 6 |
5 files changed, 10 insertions, 34 deletions
diff --git a/win32/deps-graph.txt b/win32/deps-graph.txt deleted file mode 100644 index a8326536..00000000 --- a/win32/deps-graph.txt +++ /dev/null @@ -1,27 +0,0 @@ -// http://yuml.me/diagram/scruffy/class/draw -[zlib]->[OpenSSL] -[zlib]->[libpng] -[zlib]->[libffi] -[Pixman] -[libxml2]->[Fontconfig] -[FreeType]->[Fontconfig] -[win-iconv]->[gettext-runtime] -[win-iconv]->[libxml2] -[gettext-runtime]->[GLib] -[libffi]->[GLib] -[GLib]->[Enchant] -[GLib]->[ATK] -[libpng]->[GDK-PixBuf] -[GLib]->[GDK-PixBuf] -[GLib]->[Cairo] -[libpng]->[Pixman] -[Pixman]->[Cairo] -[Fontconfig]->[Cairo] -[Cairo]->[Pango] -[HarfBuzz]->[Pango] -[Pango]->[GTK+] -[ATK]->[GTK+] -[GDK-PixBuf]->[GTK+] -[GTK+]->[HexChat] -[OpenSSL]->[HexChat] -[Enchant]->[HexChat] diff --git a/win32/hexchat.props b/win32/hexchat.props index bda8d926..61a664e8 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -64,6 +64,7 @@ copy "$(DepsRoot)\bin\gmodule-2.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\gobject-2.0.dll" "$(HexChatRel) copy "$(DepsRoot)\bin\gthread-2.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\gtk-win32-2.0.dll" "$(HexChatRel)" +copy "$(DepsRoot)\bin\harfbuzz.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\iconv.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\libeay32.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)" @@ -78,7 +79,7 @@ copy "$(DepsRoot)\bin\pangowin32-1.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\pixman-1.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)" -xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(HexChatRel)\lib\gtk-2.0\2.10.0\engines" +xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines" "$(HexChatRel)\lib\gtk-2.0\i686-pc-vs10\engines" xcopy /q /s /i etc "$(HexChatRel)\etc" xcopy /q /s /i share "$(HexChatRel)\share" xcopy /q /s /i "..\..\share\doc\COPYING" "$(HexChatRel)\share\doc\hexchat\" diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 664ba6a1..52dde085 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -82,8 +82,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj", {B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B} {461DC24A-A410-4171-8C02-CCDBF3702C2A} = {461DC24A-A410-4171-8C02-CCDBF3702C2A} {E93E1255-95D1-4B08-8FDF-B53CC6A21280} = {E93E1255-95D1-4B08-8FDF-B53CC6A21280} - {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} = {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0} - {987E9374-98A1-44BA-946F-D3472D7A7055} = {987E9374-98A1-44BA-946F-D3472D7A7055} {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} = {5EF7F47D-D09C-43C4-BF64-B28B11A0FF91} {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {6C0CA980-97C5-427A-BE61-5BCECAFABBDA} {3786FA8C-3E76-45E3-984E-FCCFF44729C9} = {3786FA8C-3E76-45E3-984E-FCCFF44729C9} diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index 6066ba7a..333bc0a6 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -77,7 +77,8 @@ Root: HKCR; Subkey: ".hct\shell\open\command"; ValueType: string; ValueName: ""; [Run] Filename: "{app}\hexchat.exe"; Description: "Run HexChat after closing the Wizard"; Flags: nowait postinstall skipifsilent -Filename: "http://hexchat.org/news.html"; Description: "See what's changed online"; Flags: shellexec runasoriginaluser postinstall skipifsilent +Filename: "http://hexchat.org/news.html"; Description: "See what's changed"; Flags: shellexec runasoriginaluser postinstall skipifsilent unchecked +Filename: "http://www.microsoft.com/en-us/download/details.aspx?id=13523"; Description: "Download Visual C++ Redistributable Package"; Flags: shellexec runasoriginaluser postinstall skipifsilent unchecked [Files] ; Add the ISSkin DLL used for skinning Inno Setup installations. @@ -109,6 +110,7 @@ Source: "gmodule-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: l Source: "gobject-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gthread-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gtk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +Source: "harfbuzz.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "iconv.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libenchant.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs @@ -126,7 +128,7 @@ Source: "zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Flags: ignoreversion; Components: libs -Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: libs +Source: "lib\gtk-2.0\i686-pc-vs10\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\i686-pc-vs10\engines"; Flags: ignoreversion; Components: libs ;obs Source: "etc\gtkpref.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: gtkengines ;obs Source: "lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: gtkengines diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss index 24abc79c..f482bdeb 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -76,7 +76,8 @@ Root: HKCR; Subkey: ".hct\shell\open\command"; ValueType: string; ValueName: ""; [Run] Filename: "{app}\hexchat.exe"; Description: "Run HexChat after closing the Wizard"; Flags: nowait postinstall skipifsilent -Filename: "http://hexchat.org/news.html"; Description: "See what's changed online"; Flags: shellexec runasoriginaluser postinstall skipifsilent +Filename: "http://hexchat.org/news.html"; Description: "See what's changed"; Flags: shellexec runasoriginaluser postinstall skipifsilent unchecked +Filename: "http://www.microsoft.com/en-us/download/details.aspx?id=8328"; Description: "Download Visual C++ Redistributable Package"; Flags: shellexec runasoriginaluser postinstall skipifsilent unchecked [Files] ; Add the ISSkin DLL used for skinning Inno Setup installations. @@ -108,6 +109,7 @@ Source: "gmodule-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: l Source: "gobject-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gthread-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "gtk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +Source: "harfbuzz.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "iconv.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libenchant.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs @@ -125,7 +127,7 @@ Source: "zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "lib\enchant\libenchant_myspell.dll"; DestDir: "{app}\lib\enchant"; Flags: ignoreversion; Components: libs -Source: "lib\gtk-2.0\2.10.0\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: libs +Source: "lib\gtk-2.0\i686-pc-vs10\engines\libwimp.dll"; DestDir: "{app}\lib\gtk-2.0\i686-pc-vs10\engines"; Flags: ignoreversion; Components: libs ;obs Source: "etc\gtkpref.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: gtkengines ;obs Source: "lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion; Components: gtkengines |