Update solution to Visual Studio 2012 Express and get rid of mpcInfo

11 files changed, 28 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index 7dad7d78..21b1f6c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,6 @@ win32/build/*
 win32/ipch/*
 win32/hexchat.opensdf
 win32/hexchat.sdf
-win32/hexchat.suo
 resource.h
-*.user
\ No newline at end of file
+*.suo
+*.user
diff --git a/plugins/dns/dns.vcxproj b/plugins/dns/dns.vcxproj
index 92316da0..e6dbad21 100644
--- a/plugins/dns/dns.vcxproj
+++ b/plugins/dns/dns.vcxproj
@@ -65,6 +65,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -87,6 +88,7 @@
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

diff --git a/plugins/exec/exec.vcxproj b/plugins/exec/exec.vcxproj
index ba620241..9e672028 100644
--- a/plugins/exec/exec.vcxproj
+++ b/plugins/exec/exec.vcxproj
@@ -65,6 +65,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -85,6 +86,7 @@
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

diff --git a/plugins/upd/upd.vcxproj b/plugins/upd/upd.vcxproj
index 458e2482..11425fbe 100644
--- a/plugins/upd/upd.vcxproj
+++ b/plugins/upd/upd.vcxproj
@@ -65,6 +65,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -87,6 +88,7 @@
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

       <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 423172a3..595a76fc 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -124,6 +124,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -143,6 +144,7 @@
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj
index 231b0251..1f5c5a9b 100644
--- a/src/fe-gtk/fe-gtk.vcxproj
+++ b/src/fe-gtk/fe-gtk.vcxproj
@@ -65,6 +65,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -74,6 +75,8 @@
       <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <AdditionalDependencies>$(DepLibs);common.lib;dirent-win32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -87,6 +90,7 @@
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

     </ClCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

@@ -96,6 +100,7 @@
       <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <AdditionalDependencies>$(DepLibs);common.lib;dirent-win32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>

+      <MinimumRequiredVersion>5.2</MinimumRequiredVersion>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/src/fe-text/fe-text.vcxproj b/src/fe-text/fe-text.vcxproj
index d44c92ca..e8f9f75d 100644
--- a/src/fe-text/fe-text.vcxproj
+++ b/src/fe-text/fe-text.vcxproj
@@ -73,6 +73,8 @@
       <OptimizeReferences>true</OptimizeReferences>

       <AdditionalDependencies>$(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

+      <MinimumRequiredVersion>5.1</MinimumRequiredVersion>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -94,6 +96,7 @@
       <OptimizeReferences>true</OptimizeReferences>

       <AdditionalDependencies>$(DepLibs);"$(OutDir)\common.lib";"$(OutDir)\dirent-win32.lib";%(AdditionalDependencies)</AdditionalDependencies>

       <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <MinimumRequiredVersion>5.2</MinimumRequiredVersion>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index 84e2574f..43179c1a 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -113,7 +113,6 @@ copy "$(OutDir)\hcdoat.dll" "$(HexChatDest)\plugins"
 copy "$(OutDir)\hcexec.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hcfishlim.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hclua.dll" "$(HexChatDest)\plugins"

-copy "$(OutDir)\hcmpcinfo.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hcperl-512.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hcperl-514.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hcperl-516.dll" "$(HexChatDest)\plugins"

@@ -196,7 +195,6 @@ copy "$(OutDir)\hcdoat.dll" "$(HexChatDest)\plugins"
 copy "$(OutDir)\hcexec.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hcfishlim.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hclua.dll" "$(HexChatDest)\plugins"

-copy "$(OutDir)\hcmpcinfo.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hcperl-512.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hcperl-514.dll" "$(HexChatDest)\plugins"

 copy "$(OutDir)\hcperl-516.dll" "$(HexChatDest)\plugins"

diff --git a/win32/hexchat.sln b/win32/hexchat.sln
index cb869353..c0b158f1 100644
--- a/win32/hexchat.sln
+++ b/win32/hexchat.sln
@@ -1,6 +1,6 @@
 

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio Express 2012 for Windows Desktop

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\src\common\common.vcxproj", "{87554B59-006C-4D94-9714-897B27067BA3}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dirent", "..\src\dirent\dirent.vcxproj", "{98B56DF9-E4F1-4696-A565-5F7823CF214D}"

@@ -70,8 +70,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exec", "..\plugins\exec\exe
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fishlim", "..\plugins\fishlim\fishlim.vcxproj", "{3C4F42FC-292A-420B-B63D-C03DFBDD8E4E}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpcinfo", "..\plugins\mpcinfo\mpcinfo.vcxproj", "{B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upd", "..\plugins\upd\upd.vcxproj", "{461DC24A-A410-4171-8C02-CCDBF3702C2A}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winamp", "..\plugins\winamp\winamp.vcxproj", "{E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE}"

diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 0f175cad..1bd0dc50 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -43,7 +43,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: full custom; Flags: disableno
 Name: "plugins\exec"; Description: "Exec"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: full custom; Flags: disablenouninstallwarning

-Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: full custom; Flags: disablenouninstallwarning

+;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: full custom; Flags: disablenouninstallwarning

 ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal full custom; Flags: disablenouninstallwarning

 Name: "plugins\sasl"; Description: "SASL"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning

@@ -166,8 +166,9 @@ 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 45ce964c..a7a44896 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -42,7 +42,7 @@ Name: "plugins\doat"; Description: "Do At"; Types: full custom; Flags: disableno
 Name: "plugins\exec"; Description: "Exec"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\hextray"; Description: "HexTray"; Types: full custom; Flags: disablenouninstallwarning

-Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: full custom; Flags: disablenouninstallwarning

+;Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: full custom; Flags: disablenouninstallwarning

 ;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal full custom; Flags: disablenouninstallwarning

 Name: "plugins\sasl"; Description: "SASL"; Types: full custom; Flags: disablenouninstallwarning

 Name: "plugins\upd"; Description: "Update Checker"; Types: normal full custom; Flags: disablenouninstallwarning

@@ -167,8 +167,9 @@ 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