From bd358dd5709a827eb3bf5d1534c8883038f9add9 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Sat, 9 Apr 2016 12:18:02 -0700
Subject: win32: Reflect lua path changes in gtk-win32

---
 win32/copy/copy.vcxproj        | 3 ++-
 win32/installer/hexchat.iss.tt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index 8a0e130f..6adedf0d 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -59,7 +59,7 @@
 
     <None Include="$(DepsRoot)\bin\lua51.dll" />
     <None Include="$(DepsRoot)\bin\girepository-1.0.dll" />
-    <None Include="$(DepsRoot)\bin\lgi.dll" />
+    <LuaLib Include="$(DepsRoot)\lib\lua\**\*.dll" />
     <LuaShare Include="$(DepsRoot)\share\lua\*.lua" />
     <LuaShare Include="$(DepsRoot)\share\lua\**\*.lua" />
     <LuaShare Include="$(DepsRoot)\share\lua\**\**\*.lua" />
@@ -87,6 +87,7 @@
     <Copy SourceFiles="@(Locale)" DestinationFiles="@(Locale->'$(HexChatRel)\share\locale\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(MSWindowsTheme)" DestinationFiles="@(MSWindowsTheme->'$(HexChatRel)\share\themes\MS-Windows\%(RecursiveDir)%(Filename)%(Extension)')" />
     <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" />
diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt
index 79a860cf..f14af6aa 100644
--- a/win32/installer/hexchat.iss.tt
+++ b/win32/installer/hexchat.iss.tt
@@ -159,7 +159,7 @@ Source: "lib\gtk-2.0\i686-pc-vs14\engines\*"; DestDir: "{app}\lib\gtk-2.0\i686-p
 
 Source: "girepository-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\lua
 Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\lua
-Source: "lgi.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: langs\lua
+Source: "lib\lua\lgi\*.dll"; DestDir: "{app}\lib\lua\lgi"; Flags: ignoreversion; Components: langs\lua
 Source: "lib\girepository-1.0\*.typelib"; DestDir: "{app}\lib\girepository-1.0"; Flags: ignoreversion; Components: langs\lua
 Source: "share\lua\*.lua"; DestDir: "{app}\share\lua"; Flags: ignoreversion; Components: langs\lua
 Source: "share\lua\lgi\*.lua"; DestDir: "{app}\share\lua\lgi"; Flags: ignoreversion; Components: langs\lua
-- 
cgit 1.4.1