LOTS of fixes to the VS solution

21 files changed, 138 insertions, 43 deletions

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index d7c6fda7..5b64ddc6 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -16,6 +16,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>

     <WholeProgramOptimization>true</WholeProgramOptimization>

     <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>WDK7</PlatformToolset>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

@@ -25,7 +26,10 @@
     <Import Project="..\xchat.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>

+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>

+  </PropertyGroup>

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

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

@@ -67,8 +71,8 @@ copy "$(DepsRoot)\bin\libpng14-14.dll" "$(XChatDest)"
 copy "$(DepsRoot)\bin\libxml2.dll" "$(XChatDest)"

 xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(XChatDest)\lib\gtk-2.0\2.10.0\engines"

 xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(XChatDest)\lib\gtk-2.0\modules\"

-xcopy /q /s /i "..\etc" "$(XChatDest)\etc"

-xcopy /q /s /i "..\share" "$(XChatDest)\share"

+xcopy /q /s /i etc "$(XChatDest)\etc"

+xcopy /q /s /i share "$(XChatDest)\share"

 copy "..\..\COPYING" "$(XChatDest)"

 copy "$(DepsRoot)\LICENSE.OPENSSL" "$(XChatDest)"

 copy "$(DepsRoot)\LICENSE.ZLIB" "$(XChatDest)"

@@ -102,13 +106,20 @@ copy "$(OutDir)\xcwinamp.dll" "$(XChatDest)\plugins"
 copy "$(OutDir)\xcwinsys.dll" "$(XChatDest)\plugins"

 copy "$(OutDir)\xcwmpa.dll" "$(XChatDest)\plugins"

 copy "$(DepsRoot)\bin\lua51.dll" "$(XChatDest)"

-xcopy /q /s /i "..\..\po\locale" "$(XChatDest)\locale"

+xcopy /q /s /i "$(OutDir)\locale" "$(XChatDest)\locale"

 xcopy /q /s /i "$(DepsRoot)\share\locale" "$(XChatDest)\share\locale"

 copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(XChatDest)"

-copy "..\isskin\watercolorlite-green.cjstyles" "$(XChatDest)"</Command>

+copy "..\installer\watercolorlite-green.cjstyles" "$(XChatDest)"</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <None Include="etc\download.png" />

+    <None Include="etc\gtk-2.0\gtkrc" />

+    <None Include="etc\gtkpref.png" />

+    <None Include="etc\music.png" />

+    <None Include="etc\system.png" />

+    <None Include="share\xml\iso-codes\iso_3166.xml" />

+    <None Include="share\xml\iso-codes\iso_639.xml" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/win32/copy/copy.vcxproj.filters b/win32/copy/copy.vcxproj.filters
index ef1ebf58..f832474d 100644
--- a/win32/copy/copy.vcxproj.filters
+++ b/win32/copy/copy.vcxproj.filters
@@ -1,2 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{e02a8c67-767c-4c6e-a854-81fae08cf4da}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files\etc">

+      <UniqueIdentifier>{503881c0-011d-443b-a373-4bfe125dcfa6}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files\share">

+      <UniqueIdentifier>{4316433a-2a8e-48f7-9020-e1f4de0d23d1}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files\etc\gtk-2.0">

+      <UniqueIdentifier>{832ebebc-ab71-4bf6-9f3a-02ec748f7c14}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files\share\xml">

+      <UniqueIdentifier>{9a881586-aed2-4f80-ba84-e521e6785566}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files\share\xml\iso-codes">

+      <UniqueIdentifier>{c825f724-0618-4160-97b7-12d6e0f2bc7b}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="etc\download.png">

+      <Filter>Resource Files\etc</Filter>

+    </None>

+    <None Include="etc\gtkpref.png">

+      <Filter>Resource Files\etc</Filter>

+    </None>

+    <None Include="etc\music.png">

+      <Filter>Resource Files\etc</Filter>

+    </None>

+    <None Include="etc\system.png">

+      <Filter>Resource Files\etc</Filter>

+    </None>

+    <None Include="etc\gtk-2.0\gtkrc">

+      <Filter>Resource Files\etc\gtk-2.0</Filter>

+    </None>

+    <None Include="share\xml\iso-codes\iso_639.xml">

+      <Filter>Resource Files\share\xml\iso-codes</Filter>

+    </None>

+    <None Include="share\xml\iso-codes\iso_3166.xml">

+      <Filter>Resource Files\share\xml\iso-codes</Filter>

+    </None>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/win32/etc/download.png b/win32/copy/etc/download.png
index 43253432..43253432 100644
--- a/win32/etc/download.png
+++ b/win32/copy/etc/download.png
Binary files differdiff --git a/win32/etc/gtk-2.0/gtkrc b/win32/copy/etc/gtk-2.0/gtkrc
index 6ac7b76c..6ac7b76c 100644
--- a/win32/etc/gtk-2.0/gtkrc
+++ b/win32/copy/etc/gtk-2.0/gtkrc
diff --git a/win32/etc/gtkpref.png b/win32/copy/etc/gtkpref.png
index 9a6c9cf9..9a6c9cf9 100644
--- a/win32/etc/gtkpref.png
+++ b/win32/copy/etc/gtkpref.png
Binary files differdiff --git a/win32/etc/music.png b/win32/copy/etc/music.png
index 3a72f118..3a72f118 100644
--- a/win32/etc/music.png
+++ b/win32/copy/etc/music.png
Binary files differdiff --git a/win32/etc/system.png b/win32/copy/etc/system.png
index fc4282c7..fc4282c7 100644
--- a/win32/etc/system.png
+++ b/win32/copy/etc/system.png
Binary files differdiff --git a/win32/share/xml/iso-codes/iso_3166.xml b/win32/copy/share/xml/iso-codes/iso_3166.xml
index 77c72eb2..77c72eb2 100644
--- a/win32/share/xml/iso-codes/iso_3166.xml
+++ b/win32/copy/share/xml/iso-codes/iso_3166.xml
diff --git a/win32/share/xml/iso-codes/iso_639.xml b/win32/copy/share/xml/iso-codes/iso_639.xml
index 02fa01fb..02fa01fb 100644
--- a/win32/share/xml/iso-codes/iso_639.xml
+++ b/win32/copy/share/xml/iso-codes/iso_639.xml
diff --git a/win32/installer/installer.vcxproj b/win32/installer/installer.vcxproj
index a8ca84fa..3cb84d56 100644
--- a/win32/installer/installer.vcxproj
+++ b/win32/installer/installer.vcxproj
@@ -16,6 +16,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>

     <WholeProgramOptimization>true</WholeProgramOptimization>

     <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>WDK7</PlatformToolset>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

@@ -25,7 +26,10 @@
     <Import Project="..\xchat.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>

+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>

+  </PropertyGroup>

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

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

@@ -39,19 +43,25 @@
       <OptimizeReferences>true</OptimizeReferences>

     </Link>

     <PreBuildEvent>

-      <Command>echo [Setup] &gt; "$(SolutionDir)\xchat-wdk-x86.iss"

-echo WizardImageFile="$(SolutionDir)\bitmaps\wizardimage.bmp" &gt;&gt; "$(SolutionDir)\xchat-wdk-x86.iss"

-echo WizardSmallImageFile="$(SolutionDir)\bitmaps\wizardsmallimage.bmp" &gt;&gt; "$(SolutionDir)\xchat-wdk-x86.iss"

-"$(OutDir)\version" -a32 &gt;&gt; "$(SolutionDir)\xchat-wdk-x86.iss"

-"$(OutDir)\version" -v &gt;&gt; "$(SolutionDir)\xchat-wdk-x86.iss"

-"$(OutDir)\version" -i &gt;&gt; "$(SolutionDir)\xchat-wdk-x86.iss"

-"$(OutDir)\version" -o32 &gt;&gt; "$(SolutionDir)\xchat-wdk-x86.iss"

-echo SetupIconFile="$(SolutionDir)\..\xchat.ico" &gt;&gt; "$(SolutionDir)\xchat-wdk-x86.iss"

-type "$(SolutionDir)\xchat-wdk-x86.skel.iss" &gt;&gt; "$(SolutionDir)\xchat-wdk-x86.iss"

-"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(SolutionDir)\xchat-wdk-x86.iss"</Command>

+      <Command>echo [Setup] &gt; "$(OutDir)\xchat-wdk-x86.iss"

+echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

+echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

+"$(OutDir)\version" -a &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

+"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

+"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

+"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

+echo SetupIconFile="$(SolutionDir)\..\xchat.ico" &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

+type xchat-wdk-x86.skel.iss &gt;&gt; "$(OutDir)\xchat-wdk-x86.iss"

+"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\xchat-wdk-x86.iss"</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <None Include="watercolorlite-blue.cjstyles" />

+    <None Include="watercolorlite-green.cjstyles" />

+    <None Include="wizardimage.bmp" />

+    <None Include="wizardsmallimage.bmp" />

+    <None Include="xchat-wdk-x64.skel.iss" />

+    <None Include="xchat-wdk-x86.skel.iss" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/win32/installer/installer.vcxproj.filters b/win32/installer/installer.vcxproj.filters
index 47cfb34e..b18a6411 100644
--- a/win32/installer/installer.vcxproj.filters
+++ b/win32/installer/installer.vcxproj.filters
@@ -1,17 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

     <Filter Include="Resource Files">

       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

     </Filter>

   </ItemGroup>

+  <ItemGroup>

+    <None Include="xchat-wdk-x64.skel.iss">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="xchat-wdk-x86.skel.iss">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="watercolorlite-blue.cjstyles">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="watercolorlite-green.cjstyles">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="wizardimage.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="wizardsmallimage.bmp">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/win32/isskin/watercolorlite-blue.cjstyles b/win32/installer/watercolorlite-blue.cjstyles
index a457029b..a457029b 100644
--- a/win32/isskin/watercolorlite-blue.cjstyles
+++ b/win32/installer/watercolorlite-blue.cjstyles
Binary files differdiff --git a/win32/isskin/watercolorlite-green.cjstyles b/win32/installer/watercolorlite-green.cjstyles
index 2b77026d..2b77026d 100644
--- a/win32/isskin/watercolorlite-green.cjstyles
+++ b/win32/installer/watercolorlite-green.cjstyles
Binary files differdiff --git a/win32/bitmaps/wizardimage.bmp b/win32/installer/wizardimage.bmp
index 9f5a4c90..9f5a4c90 100644
--- a/win32/bitmaps/wizardimage.bmp
+++ b/win32/installer/wizardimage.bmp
Binary files differdiff --git a/win32/bitmaps/wizardsmallimage.bmp b/win32/installer/wizardsmallimage.bmp
index 1bb8b790..1bb8b790 100644
--- a/win32/bitmaps/wizardsmallimage.bmp
+++ b/win32/installer/wizardsmallimage.bmp
Binary files differdiff --git a/win32/xchat-wdk-x64.skel.iss b/win32/installer/xchat-wdk-x64.skel.iss
index 1caf8198..e0a804db 100644
--- a/win32/xchat-wdk-x64.skel.iss
+++ b/win32/installer/xchat-wdk-x64.skel.iss
@@ -11,8 +11,8 @@ DefaultDirName={pf}\XChat-WDK
 DefaultGroupName=XChat-WDK

 DisableProgramGroupPage=yes

 SolidCompression=yes

-SourceDir=dist-x64

-OutputDir=..\

+SourceDir=..\..\rel

+OutputDir=..\..

 FlatComponentsList=no

 PrivilegesRequired=none

 ShowComponentSizes=no

diff --git a/win32/xchat-wdk-x86.skel.iss b/win32/installer/xchat-wdk-x86.skel.iss
index 511a29f8..748c2b19 100644
--- a/win32/xchat-wdk-x86.skel.iss
+++ b/win32/installer/xchat-wdk-x86.skel.iss
@@ -11,8 +11,8 @@ DefaultDirName={pf}\XChat-WDK
 DefaultGroupName=XChat-WDK

 DisableProgramGroupPage=yes

 SolidCompression=yes

-SourceDir=dist\Win32

-OutputDir=..\

+SourceDir=..\rel

+OutputDir=..

 FlatComponentsList=no

 PrivilegesRequired=none

 ShowComponentSizes=no

diff --git a/win32/nls/nls.vcxproj b/win32/nls/nls.vcxproj
index a9fa71bf..10e53bd8 100644
--- a/win32/nls/nls.vcxproj
+++ b/win32/nls/nls.vcxproj
@@ -26,7 +26,10 @@
     <Import Project="..\xchat.props" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

-  <PropertyGroup />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>

+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>

+  </PropertyGroup>

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

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

@@ -45,11 +48,11 @@
     </PostBuildEvent>

     <PreBuildEvent>

       <Command>cd ..\..\po

-rmdir /q /s locale

-mkdir locale

+rmdir /q /s "$(OutDir)\locale"

+mkdir "$(OutDir)\locale"

 for %%A in (*.po) do (

-mkdir locale\%%~nA\LC_MESSAGES

-"$(DepsRoot)\bin\msgfmt" -co locale\%%~nA\LC_MESSAGES\xchat.mo %%A

+mkdir "$(OutDir)\locale\%%~nA\LC_MESSAGES"

+"$(DepsRoot)\bin\msgfmt" -co "$(OutDir)\locale\%%~nA\LC_MESSAGES\xchat.mo" %%A

 )</Command>

     </PreBuildEvent>

   </ItemDefinitionGroup>

diff --git a/win32/share/themes/Murrine/gtk-2.0/gtkrc b/win32/share/themes/Murrine/gtk-2.0/gtkrc
deleted file mode 100644
index b9d95848..00000000
--- a/win32/share/themes/Murrine/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,7 +0,0 @@
-style "default"
-{
-  engine "murrine" 
-  {
-  }
-}
-class "*" style "default"
diff --git a/win32/xchat.props b/win32/xchat.props
index e0aa21c8..3038fb04 100644
--- a/win32/xchat.props
+++ b/win32/xchat.props
@@ -35,7 +35,7 @@
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>

     <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" xchatpng "$(SolutionDir)\..\xchat.png"</Pixmaps>

     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>

-    <XChatDest>$(SolutionDir)\dist\$(PlatformName)</XChatDest>

+    <XChatDest>$(SolutionDir)build\$(PlatformName)\rel</XChatDest>

   </PropertyGroup>

   <ItemDefinitionGroup />

   <ItemGroup />

diff --git a/win32/xchat.sln b/win32/xchat.sln
index 050313eb..84e1190e 100644
--- a/win32/xchat.sln
+++ b/win32/xchat.sln
@@ -89,10 +89,32 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nls", "nls\nls.vcxproj", "{B10A2C41-344C-43E0-A32D-B9587C198D8B}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy", "copy\copy.vcxproj", "{C9B735E4-75BC-45AC-A5E3-39A6D076F912}"

+	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}

+		{17E4BE39-76F7-4A06-AD21-EFD0C5091F76} = {17E4BE39-76F7-4A06-AD21-EFD0C5091F76}

+		{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}

+		{6C0CA980-97C5-427A-BE61-5BCECAFABBDA} = {6C0CA980-97C5-427A-BE61-5BCECAFABBDA}

+		{3786FA8C-3E76-45E3-984E-FCCFF44729C9} = {3786FA8C-3E76-45E3-984E-FCCFF44729C9}

+		{B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC} = {B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC}

+		{E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE} = {E78C0D9A-798E-4BF6-B0CC-6FECB8CA2FCE}

+		{18871EBA-AC85-4652-8919-EB8064B9A714} = {18871EBA-AC85-4652-8919-EB8064B9A714}

+		{E4BDB4C8-2335-415A-ACEE-BA88B19BFE82} = {E4BDB4C8-2335-415A-ACEE-BA88B19BFE82}

+		{3C4F42FC-292A-420B-B63D-C03DFBDD8E4E} = {3C4F42FC-292A-420B-B63D-C03DFBDD8E4E}

+	EndProjectSection

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer", "installer\installer.vcxproj", "{5A0F4962-E670-4DA2-9E45-52CC47F26E2F}"

 	ProjectSection(ProjectDependencies) = postProject

-		{B10A2C41-344C-43E0-A32D-B9587C198D8B} = {B10A2C41-344C-43E0-A32D-B9587C198D8B}

 		{C9B735E4-75BC-45AC-A5E3-39A6D076F912} = {C9B735E4-75BC-45AC-A5E3-39A6D076F912}

 	EndProjectSection

 EndProject