From bf55264e6dde23d38502a0439f9a2e1e492e68ec Mon Sep 17 00:00:00 2001
From: wangqr <wangqr@wangqr.tk>
Date: Wed, 10 Apr 2019 14:51:17 -0400
Subject: [PATCH] Fix VS2019 compile issues

---
 CMakeLists.txt                    | 17 ++++++++---------
 src/subtitles_provider_libass.cpp |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22746e269..063fcb8a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.11)
+cmake_policy(SET CMP0074 NEW)
 
 project(Aegisub)
 
@@ -393,7 +394,7 @@ if (MSVC)
     add_definitions("-DNOMINMAX -MP -DINITGUID")
     set_target_properties(Aegisub PROPERTIES COMPILE_FLAGS "/Yu${PROJECT_SOURCE_DIR}/src/agi_pre.h" COMPILE_FLAGS "/FI${PROJECT_SOURCE_DIR}/src/agi_pre.h")
     target_link_libraries (Aegisub Usp10)
-    target_sources(Aegisub PRIVATE src/font_file_lister_gdi.cpp)
+    target_sources(Aegisub PRIVATE src/font_file_lister_gdi.cpp src/res/res.rc src/res/strings.rc)
 else(MSVC)
     target_compile_options(Aegisub PRIVATE -include "${PROJECT_SOURCE_DIR}/src/agi_pre.h")
 endif(MSVC)
@@ -411,7 +412,12 @@ find_package(OpenGL REQUIRED)
 include_directories(${OPENGL_INCLUDE_DIR})
 target_link_libraries (Aegisub ${OPENGL_LIBRARIES})
 
-find_package(ICU REQUIRED uc)
+find_package(Iconv REQUIRED)
+include_directories(${Iconv_INCLUDE_DIRS})
+target_link_libraries (Aegisub ${Iconv_LIBRARIES})
+add_definitions("-DHAVE_ICONV")
+
+find_package(ICU REQUIRED uc dt in)
 include_directories(${ICU_INCLUDE_DIRS})
 target_link_libraries (Aegisub ${ICU_LIBRARIES})
 
@@ -423,13 +429,6 @@ find_package(ZLIB REQUIRED)
 include_directories(${ZLIB_INCLUDE_DIRS})
 target_link_libraries (Aegisub ${ZLIB_LIBRARIES})
 
-find_package(Iconv)
-if (Iconv_FOUND)
-    include_directories(${Iconv_INCLUDE_DIRS})
-    target_link_libraries (Aegisub ${Iconv_LIBRARIES})
-    add_definitions("-DHAVE_ICONV")
-endif(Iconv_FOUND)
-
 find_package(ALSA)
 if (ALSA_FOUND)
     include_directories(${ALSA_INCLUDE_DIRS})
diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
index fb62e3334..51655400d 100644
--- a/src/subtitles_provider_libass.cpp
+++ b/src/subtitles_provider_libass.cpp
@@ -54,7 +54,7 @@
 #include <wx/thread.h>
 
 extern "C" {
-#include <ass/ass.h>
+#include <ass.h>
 }
 
 namespace {