From 541b9ca744ec68d874230560376d64a4b45937ce Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Tue, 6 Mar 2018 14:35:51 +0000
Subject: win32: Update to build against gvsbuild

---
 win32/copy/copy.vcxproj | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'win32/copy')

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index 6adedf0d..f96c80f3 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -24,10 +24,10 @@
   <Import Project="..\hexchat.props" />
   <ItemGroup>
     <None Include="$(DepsRoot)\bin\cert.pem" />
-    <None Include="$(DepsRoot)\bin\atk-1.0.dll" />
+    <None Include="$(DepsRoot)\bin\atk-1.0-0.dll" />
     <None Include="$(DepsRoot)\bin\cairo.dll" />
     <None Include="$(DepsRoot)\bin\fontconfig.dll" />
-    <None Include="$(DepsRoot)\bin\gdk_pixbuf-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gdk_pixbuf-2.0-0.dll" />
     <None Include="$(DepsRoot)\bin\gdk-win32-2.0.dll" />
     <None Include="$(DepsRoot)\bin\gio-2.0.dll" />
     <None Include="$(DepsRoot)\bin\glib-2.0.dll" />
@@ -37,19 +37,17 @@
     <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper-console.exe" />
     <None Include="$(DepsRoot)\bin\gthread-2.0.dll" />
     <None Include="$(DepsRoot)\bin\gtk-win32-2.0.dll" />
-    <None Include="$(DepsRoot)\bin\harfbuzz.dll" />
     <None Include="$(DepsRoot)\bin\iconv.dll" />
     <None Include="$(DepsRoot)\bin\libeay32.dll" />
     <None Include="$(DepsRoot)\bin\libenchant.dll" />
-    <None Include="$(DepsRoot)\bin\libffi.dll" />
-    <None Include="$(DepsRoot)\bin\libintl.dll" />
+    <None Include="$(DepsRoot)\bin\ffi-7.dll" />
+    <None Include="$(DepsRoot)\bin\intl.dll" />
     <None Include="$(DepsRoot)\bin\libpng16.dll" />
     <None Include="$(DepsRoot)\bin\libxml2.dll" />
-    <None Include="$(DepsRoot)\bin\pango-1.0.dll" />
-    <None Include="$(DepsRoot)\bin\pangocairo-1.0.dll" />
-    <None Include="$(DepsRoot)\bin\pangoft2-1.0.dll" />
-    <None Include="$(DepsRoot)\bin\pangowin32-1.0.dll" />
-    <None Include="$(DepsRoot)\bin\pixman-1.dll" />
+    <None Include="$(DepsRoot)\bin\pango-1.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\pangocairo-1.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\pangoft2-1.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\pangowin32-1.0-0.dll" />
     <None Include="$(DepsRoot)\bin\ssleay32.dll" />
     <None Include="$(DepsRoot)\bin\zlib1.dll" />
     <None Include="$(WinSparklePath)\WinSparkle.dll" />
@@ -58,7 +56,7 @@
     <None Include="readme.url" />
 
     <None Include="$(DepsRoot)\bin\lua51.dll" />
-    <None Include="$(DepsRoot)\bin\girepository-1.0.dll" />
+    <None Include="$(DepsRoot)\bin\girepository-1.0-1.dll" />
     <LuaLib Include="$(DepsRoot)\lib\lua\**\*.dll" />
     <LuaShare Include="$(DepsRoot)\share\lua\*.lua" />
     <LuaShare Include="$(DepsRoot)\share\lua\**\*.lua" />
@@ -67,6 +65,8 @@
 
     <Engines Include="$(DepsRoot)\lib\gtk-2.0\i686-pc-vs14\engines\**\*" />
 
+    <FontConfig Include="$(DepsRoot)\etc\fonts\*"/>
+
     <Share Include="share\**\*" />
 
     <DepsRootDocs Include="$(DepsRoot)\share\doc\**\*" />
@@ -78,9 +78,9 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="Build">
     <Copy SourceFiles="@(None)" DestinationFolder="$(HexChatRel)" />
+    <Copy SourceFiles="@(FontConfig)" DestinationFolder="$(HexChatRel)\etc\fonts" />
     <Copy SourceFiles="@(Engines)" DestinationFiles="@(Engines->'$(HexChatRel)\lib\gtk-2.0\i686-pc-vs14\engines\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Share)" DestinationFiles="@(Share->'$(HexChatRel)\share\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(DepsRootDocs)" DestinationFiles="@(DepsRootDocs->'$(HexChatRel)\share\doc\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="..\..\COPYING" DestinationFolder="$(HexChatRel)\share\doc\hexchat" />
     <Copy SourceFiles="$(WinSparklePath)\COPYING" DestinationFolder="$(HexChatRel)\share\doc\WinSparkle" />
     <Copy SourceFiles="$(DepsRoot)\lib\enchant\libenchant_myspell.dll" DestinationFolder="$(HexChatRel)\lib\enchant" />
@@ -89,7 +89,9 @@
     <Copy SourceFiles="@(LuaShare)" DestinationFiles="@(LuaShare->'$(HexChatRel)\share\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(LuaLib)" DestinationFiles="@(LuaLib->'$(HexChatRel)\lib\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Typelib)" DestinationFiles="@(Typelib->'$(HexChatRel)\lib\girepository-1.0\%(Filename)%(Extension)')" />
-	
+
     <WriteLinesToFile File="$(HexChatRel)portable-mode" Lines="2" Overwrite="true" />
+
+    <Copy SourceFiles="@(DepsRootDocs)" DestinationFiles="@(DepsRootDocs->'$(HexChatRel)\share\doc\%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 </Project>
-- 
cgit 1.4.1