From 90db7e85c2d738d15c9cb82cdd3db95005e39b85 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Wed, 3 Oct 2012 18:26:48 +0200 Subject: [PATCH] Complete the VS2010 reversion --- plugins/dns/dns-xp.vcxproj | 2 -- plugins/dns/dns.vcxproj | 2 -- plugins/exec/exec-xp.vcxproj | 2 -- plugins/exec/exec.vcxproj | 2 -- plugins/upd/upd-xp.vcxproj | 2 -- plugins/upd/upd.vcxproj | 2 -- src/common/common-xp.vcxproj | 2 -- src/common/common.vcxproj | 2 -- src/fe-gtk/fe-gtk-xp.vcxproj | 3 --- src/fe-gtk/fe-gtk.vcxproj | 3 --- src/fe-text/fe-text-xp.vcxproj | 1 - src/fe-text/fe-text.vcxproj | 1 - win32/hexchat-xp.props | 1 + win32/hexchat.props | 1 + win32/installer/hexchat-x64.skel.iss | 7 +++---- win32/installer/hexchat-x86.skel.iss | 7 +++---- win32/installer/hexchat-xp-x64.skel.iss | 7 +++---- win32/installer/hexchat-xp-x86.skel.iss | 7 +++---- 18 files changed, 14 insertions(+), 40 deletions(-) diff --git a/plugins/dns/dns-xp.vcxproj b/plugins/dns/dns-xp.vcxproj index 24a302a1..1533e926 100644 --- a/plugins/dns/dns-xp.vcxproj +++ b/plugins/dns/dns-xp.vcxproj @@ -66,7 +66,6 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions) ..;%(AdditionalIncludeDirectories) true - false Windows @@ -89,7 +88,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions) ..;%(AdditionalIncludeDirectories) true - false Windows diff --git a/plugins/dns/dns.vcxproj b/plugins/dns/dns.vcxproj index 8cf1f9a9..7cbfbada 100644 --- a/plugins/dns/dns.vcxproj +++ b/plugins/dns/dns.vcxproj @@ -63,7 +63,6 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions) ..;%(AdditionalIncludeDirectories) true - false Windows @@ -86,7 +85,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions) ..;%(AdditionalIncludeDirectories) true - false Windows diff --git a/plugins/exec/exec-xp.vcxproj b/plugins/exec/exec-xp.vcxproj index 07d44a2f..ce082176 100644 --- a/plugins/exec/exec-xp.vcxproj +++ b/plugins/exec/exec-xp.vcxproj @@ -66,7 +66,6 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions) true ..;%(AdditionalIncludeDirectories) - false Windows @@ -87,7 +86,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions) true ..;%(AdditionalIncludeDirectories) - false Windows diff --git a/plugins/exec/exec.vcxproj b/plugins/exec/exec.vcxproj index 2e437396..5880581a 100644 --- a/plugins/exec/exec.vcxproj +++ b/plugins/exec/exec.vcxproj @@ -63,7 +63,6 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions) true ..;%(AdditionalIncludeDirectories) - false Windows @@ -84,7 +83,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions) true ..;%(AdditionalIncludeDirectories) - false Windows diff --git a/plugins/upd/upd-xp.vcxproj b/plugins/upd/upd-xp.vcxproj index d3526eda..303d706f 100644 --- a/plugins/upd/upd-xp.vcxproj +++ b/plugins/upd/upd-xp.vcxproj @@ -66,7 +66,6 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) true ..;%(AdditionalIncludeDirectories) - false Windows @@ -89,7 +88,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) true ..;%(AdditionalIncludeDirectories) - false Windows diff --git a/plugins/upd/upd.vcxproj b/plugins/upd/upd.vcxproj index 9d864ace..4b40d4df 100644 --- a/plugins/upd/upd.vcxproj +++ b/plugins/upd/upd.vcxproj @@ -63,7 +63,6 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) true ..;%(AdditionalIncludeDirectories) - false Windows @@ -86,7 +85,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions) true ..;%(AdditionalIncludeDirectories) - false Windows diff --git a/src/common/common-xp.vcxproj b/src/common/common-xp.vcxproj index c88e14e0..c20359f4 100644 --- a/src/common/common-xp.vcxproj +++ b/src/common/common-xp.vcxproj @@ -127,7 +127,6 @@ WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) true - false Windows @@ -147,7 +146,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) true - false Windows diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 5b5b9e8a..9615d94c 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -124,7 +124,6 @@ WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) true - false Windows @@ -144,7 +143,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions) $(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories) true - false Windows diff --git a/src/fe-gtk/fe-gtk-xp.vcxproj b/src/fe-gtk/fe-gtk-xp.vcxproj index 6fe904c9..26fb830f 100644 --- a/src/fe-gtk/fe-gtk-xp.vcxproj +++ b/src/fe-gtk/fe-gtk-xp.vcxproj @@ -66,7 +66,6 @@ WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) $(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) true - false Windows @@ -76,7 +75,6 @@ $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) $(DepLibs);common.lib;dirent-win32.lib;%(AdditionalDependencies) mainCRTStartup - false @@ -90,7 +88,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) $(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) true - false Windows diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index 2e929103..4a150d92 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -63,7 +63,6 @@ WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) $(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) true - false Windows @@ -73,7 +72,6 @@ $(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories) $(DepLibs);common.lib;dirent-win32.lib;%(AdditionalDependencies) mainCRTStartup - false @@ -87,7 +85,6 @@ WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions) $(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories) true - false Windows diff --git a/src/fe-text/fe-text-xp.vcxproj b/src/fe-text/fe-text-xp.vcxproj index b0b764df..cd87b616 100644 --- a/src/fe-text/fe-text-xp.vcxproj +++ b/src/fe-text/fe-text-xp.vcxproj @@ -74,7 +74,6 @@ true $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) - false diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj index 0346138c..3a8d5c31 100644 --- a/src/fe-text/fe-text.vcxproj +++ b/src/fe-text/fe-text.vcxproj @@ -71,7 +71,6 @@ true $(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies) $(DepsRoot)\lib;%(AdditionalLibraryDirectories) - false diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props index 9fa5baf6..e77eb29c 100644 --- a/win32/hexchat-xp.props +++ b/win32/hexchat-xp.props @@ -89,6 +89,7 @@ copy "$(OutDir)\hcdoat.dll" "$(HexChatRel)\plugins" copy "$(OutDir)\hcexec.dll" "$(HexChatRel)\plugins" copy "$(OutDir)\hcfishlim.dll" "$(HexChatRel)\plugins" copy "$(OutDir)\hclua.dll" "$(HexChatRel)\plugins" +copy "$(OutDir)\hcmpcinfo.dll" "$(HexChatRel)\plugins" copy "$(OutDir)\hcperl-512.dll" "$(HexChatRel)\plugins" copy "$(OutDir)\hcperl-514.dll" "$(HexChatRel)\plugins" copy "$(OutDir)\hcperl-516.dll" "$(HexChatRel)\plugins" diff --git a/win32/hexchat.props b/win32/hexchat.props index 5403fc4b..e9dd136a 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -102,6 +102,7 @@ copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcexec.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hcfishlim.dll" "$(HexChatRel)\plugins" copy "$(HexChatBin)hclua.dll" "$(HexChatRel)\plugins" +copy "$(OutDir)\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" diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index 4089c925..5d5a07d2 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -42,7 +42,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenounins Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning -;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning +Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning @@ -165,9 +165,8 @@ Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim -Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp -; or plugins\mpcinfo -;Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo +Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo +Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo ;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss index 30eb912c..8c660c18 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -41,7 +41,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenounins Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning -;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning +Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning @@ -166,9 +166,8 @@ Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim -Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp -; or plugins\mpcinfo -;Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo +Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo +Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo ;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd diff --git a/win32/installer/hexchat-xp-x64.skel.iss b/win32/installer/hexchat-xp-x64.skel.iss index 4089c925..5d5a07d2 100644 --- a/win32/installer/hexchat-xp-x64.skel.iss +++ b/win32/installer/hexchat-xp-x64.skel.iss @@ -42,7 +42,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenounins Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning -;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning +Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning @@ -165,9 +165,8 @@ Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim -Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp -; or plugins\mpcinfo -;Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo +Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo +Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo ;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd diff --git a/win32/installer/hexchat-xp-x86.skel.iss b/win32/installer/hexchat-xp-x86.skel.iss index 30eb912c..8c660c18 100644 --- a/win32/installer/hexchat-xp-x86.skel.iss +++ b/win32/installer/hexchat-xp-x86.skel.iss @@ -41,7 +41,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: custom; Flags: disablenounins Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning -;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning +Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning @@ -166,9 +166,8 @@ Source: "plugins\hcdns.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Com Source: "plugins\hcdoat.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\doat Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\exec Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim -Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp -; or plugins\mpcinfo -;Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo +Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo +Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo ;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd