From 036fe1bda6b068e9112a62744f6ce430c33f04eb Mon Sep 17 00:00:00 2001
From: Skarn <skarnproject@gmail.com>
Date: Thu, 3 Feb 2022 12:02:24 +0300
Subject: [PATCH] fix build issues on Windows, add automatic deploy for Windows

---
 CMakeLists.txt   | 7 +++++++
 cmake            | 2 +-
 src/noggit/WMO.h | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a72186d..b2393e59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -363,6 +363,12 @@ add_custom_command(TARGET noggit POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E remove -f 
         $<TARGET_FILE_DIR:noggit>/definitions/.git)
 
+# deploy for Qt on Windows
+IF(WIN32)
+  include(windeployqt)
+  windeployqt(noggit)
+ENDIF()
+
 SET_PROPERTY(TARGET noggit PROPERTY AUTOMOC ON)
 
 IF(APPLE)
@@ -422,3 +428,4 @@ IF(NOGGIT_LOGTOCONSOLE AND WIN32)
 ENDIF()
 
 includePlatform("pack")
+
diff --git a/cmake b/cmake
index 59b70e0e..6c21df10 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 59b70e0e2c99e2e41e085c675919eabe421235d3
+Subproject commit 6c21df10194d8d878151dfc1c5ac2c1a85c51f13
diff --git a/src/noggit/WMO.h b/src/noggit/WMO.h
index 785b6710..bb242aac 100644
--- a/src/noggit/WMO.h
+++ b/src/noggit/WMO.h
@@ -245,7 +245,7 @@ static_assert ( sizeof (mohd_flags) == sizeof (std::uint16_t)
 
 class WMO : public AsyncObject
 {
-  friend class WMORender;
+  friend class Noggit::Rendering::WMORender;
 
 public:
   explicit WMO(BlizzardArchive::Listfile::FileKey const& file_key, Noggit::NoggitRenderContext context );