diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/hexchat.props | 10 | ||||
| -rw-r--r-- | win32/hexchat.sln | 6 | ||||
| -rw-r--r-- | win32/installer/hexchat-x64.skel.iss | 12 | ||||
| -rw-r--r-- | win32/installer/hexchat-x86.skel.iss | 12 |
4 files changed, 17 insertions, 23 deletions
diff --git a/win32/hexchat.props b/win32/hexchat.props index 9104b1af..bda8d926 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -17,7 +17,7 @@ <DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot> <GendefPath>$(YourGendefPath)</GendefPath> <MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath> - <LuaLib>lua51</LuaLib> + <!--LuaLib>lua51</LuaLib> <LuaOutput>hclua</LuaOutput> <TclPath>$(YourTclPath)\$(PlatformName)</TclPath> <TclLib>tcl85</TclLib> @@ -27,7 +27,7 @@ <Perl512Output>hcperl-512</Perl512Output> <Perl514Path>$(YourPerl514Path)\$(PlatformName)</Perl514Path> <Perl514Lib>perl514</Perl514Lib> - <Perl514Output>hcperl-514</Perl514Output> + <Perl514Output>hcperl-514</Perl514Output--> <Perl516Path>$(YourPerl516Path)\$(PlatformName)</Perl516Path> <Perl516Lib>perl516</Perl516Lib> <Perl516Output>hcperl-516</Perl516Output> @@ -70,7 +70,7 @@ copy "$(DepsRoot)\bin\libenchant.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\libintl.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\libpng15.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\libxml2.dll" "$(HexChatRel)" -copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)" +::copy "$(DepsRoot)\bin\lua51.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\pango-1.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\pangocairo-1.0.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\pangoft2-1.0.dll" "$(HexChatRel)" @@ -90,13 +90,13 @@ copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hchextray.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hclua.dll" "$(HexChatRel)\plugins" +::copy "$(HexChatBin)hclua.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcmpcinfo.dll" "$(HexChatRel)\plugins" ::copy "$(HexChatBin)hcperl-512.dll" "$(HexChatRel)\plugins" ::copy "$(HexChatBin)hcperl-514.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcperl-516.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcpython.dll" "$(HexChatRel)\plugins" -copy "$(HexChatBin)hctcl.dll" "$(HexChatRel)\plugins" +::copy "$(HexChatBin)hctcl.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcupd.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcwinamp.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcsysinfo.dll" "$(HexChatRel)\plugins" diff --git a/win32/hexchat.sln b/win32/hexchat.sln index 49688791..35e3070d 100644 --- a/win32/hexchat.sln +++ b/win32/hexchat.sln @@ -77,7 +77,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj", ProjectSection(ProjectDependencies) = postProject {19C52A0A-A790-409E-A28A-9745FF990F5C} = {19C52A0A-A790-409E-A28A-9745FF990F5C} {E7F4DB0A-510D-41EF-B284-6E1DE1CC450D} = {E7F4DB0A-510D-41EF-B284-6E1DE1CC450D} - {646B4316-C8B8-4DB6-B6AE-E586929E5729} = {646B4316-C8B8-4DB6-B6AE-E586929E5729} {4980AF24-9D42-427D-A8E6-0DF3B97C455D} = {4980AF24-9D42-427D-A8E6-0DF3B97C455D} {3024CF36-85E5-4E00-9608-7002E2C7EF14} = {3024CF36-85E5-4E00-9608-7002E2C7EF14} {58654438-F674-42F7-88FA-73EF90AD80B1} = {58654438-F674-42F7-88FA-73EF90AD80B1} @@ -85,7 +84,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} - {2773666A-8CFC-4533-A043-EAD59F16A1C7} = {2773666A-8CFC-4533-A043-EAD59F16A1C7} {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} @@ -135,9 +133,7 @@ Global {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|x64.ActiveCfg = Release|x64 {E93E1255-95D1-4B08-8FDF-B53CC6A21280}.Release|x64.Build.0 = Release|x64 {2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|Win32.ActiveCfg = Release|Win32 - {2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|Win32.Build.0 = Release|Win32 {2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|x64.ActiveCfg = Release|x64 - {2773666A-8CFC-4533-A043-EAD59F16A1C7}.Release|x64.Build.0 = Release|x64 {987E9374-98A1-44BA-946F-D3472D7A7055}.Release|Win32.ActiveCfg = Release|Win32 {987E9374-98A1-44BA-946F-D3472D7A7055}.Release|x64.ActiveCfg = Release|x64 {C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}.Release|Win32.ActiveCfg = Release|Win32 @@ -151,9 +147,7 @@ Global {19C52A0A-A790-409E-A28A-9745FF990F5C}.Release|x64.ActiveCfg = Release|x64 {19C52A0A-A790-409E-A28A-9745FF990F5C}.Release|x64.Build.0 = Release|x64 {646B4316-C8B8-4DB6-B6AE-E586929E5729}.Release|Win32.ActiveCfg = Release|Win32 - {646B4316-C8B8-4DB6-B6AE-E586929E5729}.Release|Win32.Build.0 = Release|Win32 {646B4316-C8B8-4DB6-B6AE-E586929E5729}.Release|x64.ActiveCfg = Release|x64 - {646B4316-C8B8-4DB6-B6AE-E586929E5729}.Release|x64.Build.0 = Release|x64 {4980AF24-9D42-427D-A8E6-0DF3B97C455D}.Release|Win32.ActiveCfg = Release|Win32 {4980AF24-9D42-427D-A8E6-0DF3B97C455D}.Release|Win32.Build.0 = Release|Win32 {4980AF24-9D42-427D-A8E6-0DF3B97C455D}.Release|x64.ActiveCfg = Release|x64 diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index 1e04c82c..7f0a55bc 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -48,11 +48,11 @@ Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning -Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning -Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: custom; Flags: disablenouninstallwarning +;Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning +;Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: custom; Flags: disablenouninstallwarning Name: "langs\perl"; Description: "Perl"; Types: custom; Flags: disablenouninstallwarning Name: "langs\python"; Description: "Python"; Types: custom; Flags: disablenouninstallwarning -Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallwarning +;Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallwarning [Tasks] Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked @@ -115,7 +115,7 @@ Source: "libenchant.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: li Source: "libintl.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libpng15.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs -Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +;Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pango-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pangocairo-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pangoft2-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs @@ -157,9 +157,9 @@ Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa -Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua +;Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python -Source: "plugins\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl +;Source: "plugins\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl ;Source: "plugins\hcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512 ;Source: "plugins\hcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514 diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss index 8c18ac2f..48d02c42 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -47,11 +47,11 @@ Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\wmpa"; Description: "Windows Media Player Announcer"; Types: custom; Flags: disablenouninstallwarning Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disablenouninstallwarning -Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning -Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: custom; Flags: disablenouninstallwarning +;Name: "langs\lua"; Description: "Lua"; Types: custom; Flags: disablenouninstallwarning +;Name: "langs\lua\luawdk"; Description: "Lua-WDK"; Types: custom; Flags: disablenouninstallwarning Name: "langs\perl"; Description: "Perl"; Types: custom; Flags: disablenouninstallwarning Name: "langs\python"; Description: "Python"; Types: custom; Flags: disablenouninstallwarning -Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallwarning +;Name: "langs\tcl"; Description: "Tcl"; Types: custom; Flags: disablenouninstallwarning [Tasks] Name: portable; Description: "Yes"; GroupDescription: "Portable Install (no Registry entries, no Start Menu icons, no uninstaller):"; Flags: unchecked @@ -114,7 +114,7 @@ Source: "libenchant.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: li Source: "libintl.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libpng15.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs -Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs +;Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pango-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pangocairo-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "pangoft2-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs @@ -156,9 +156,9 @@ Source: "plugins\hcsysinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Source: "plugins\hchextray.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\hextray Source: "plugins\hcwmpa.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\wmpa -Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua +;Source: "plugins\hclua.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\lua Source: "plugins\hcpython.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\python -Source: "plugins\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl +;Source: "plugins\hctcl.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: langs\tcl ;Source: "plugins\hcperl-512.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl512 ;Source: "plugins\hcperl-514.dll"; DestDir: "{app}\plugins"; DestName: "hcperl.dll"; Flags: ignoreversion; Components: langs\perl; Tasks: perl514 |