From 066f4988d30f8380a9aec5e72734165d6dd71637 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Sat, 14 Mar 2020 23:03:47 +0000
Subject: [PATCH] CMake cleanup

---
 CMakeLists.txt | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ee572be..c82e5c14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,10 +250,6 @@ else()
 	list(APPEND RESOURCES "BITMAP/pixel.bmp" "FONT/LiberationMono.ttf")
 endif()
 
-if(NOT WIN32)
-	list(APPEND RESOURCES "ICON/ICON_MINI.bmp")
-endif()
-
 if(FIX_BUGS)
 	target_compile_definitions(CSE2 PRIVATE FIX_BUGS)
 endif()
@@ -334,6 +330,11 @@ if(MSVC)
 	target_compile_options(CSE2 PRIVATE "/utf-8")
 endif()
 
+# On Windows, we use native icons instead
+if(NOT WIN32)
+	list(APPEND RESOURCES "ICON/ICON_MINI.bmp")
+endif()
+
 
 ##################
 # Misc. settings #
@@ -452,9 +453,6 @@ ExternalProject_Add(bin2h
 	CMAKE_ARGS
 		-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
 		-DCMAKE_BUILD_TYPE=Release
-		-DWARNINGS=${WARNINGS}
-		-DWARNINGS_ALL=${WARNINGS_ALL}
-		-DWARNINGS_FATAL=${WARNINGS_FATAL}
 	INSTALL_COMMAND
 		${CMAKE_COMMAND} --build . --config Release --target install
 )