From 19147eee6603ad6f8580e65c60bc2b4dacdb3f59 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 7 Jan 2022 00:29:31 +0100
Subject: [PATCH] (Windows) CMake configuration changes to make rlottie build
 correctly.

---
 es-app/CMakeLists.txt   | 6 +++++-
 es-core/CMakeLists.txt  | 4 +++-
 external/CMakeLists.txt | 6 +++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index 6db4af3cd..5d9b84ce5 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -116,7 +116,9 @@ endif()
 #---------------------------------------------------------------------------------------------------
 # Miscellaneous configuration.
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-macros")
+if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-macros")
+endif()
 
 #---------------------------------------------------------------------------------------------------
 # OS-specific installation and package generation setup.
@@ -153,6 +155,7 @@ if(WIN32)
                       ../libssl-1_1-x64.dll
                       ../MSVCP140.dll
                       ../pugixml.dll
+                      ../rlottie.dll
                       ../SDL2.dll
                       ../VCOMP140.DLL
                       ../VCRUNTIME140.dll
@@ -172,6 +175,7 @@ if(WIN32)
                       ../libcurl-x64.dll
                       ../libfreetype.dll
                       ../libpugixml.dll
+                      ../librlottie.dll
                       ../libssl-1_1-x64.dll
                       ../SDL2.dll
                       ../vcomp140.dll
diff --git a/es-core/CMakeLists.txt b/es-core/CMakeLists.txt
index 822d7b1ea..464b39054 100644
--- a/es-core/CMakeLists.txt
+++ b/es-core/CMakeLists.txt
@@ -167,7 +167,9 @@ set(CORE_SOURCES
 #---------------------------------------------------------------------------------------------------
 # Miscellaneous configuration.
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-macros")
+if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-macros")
+endif()
 
 include_directories(${COMMON_INCLUDE_DIRS})
 add_library(es-core STATIC ${CORE_SOURCES} ${CORE_HEADERS})
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 435bcc9ef..736eec750 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -6,6 +6,10 @@
 #  CMake configuration for bundled dependencies built in-tree.
 #
 
-set(BUILD_SHARED_LIBS OFF)
+# On Windows, rlottie is built as a DLL file.
+if(NOT WIN32)
+    set(BUILD_SHARED_LIBS OFF)
+endif()
+
 option(LOTTIE_MODULE OFF)
 add_subdirectory("rlottie")