LOTS of fixes to the VS solution

1 files changed, 16 insertions, 5 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">