From a6b6d98a943b11bae40eec7674c2ca68e45122c0 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Thu, 21 Apr 2016 16:59:13 +0000
Subject: [PATCH] Win32: move resources to res/.

---
 res/CMakeLists.txt              |   4 ++++
 {src => res}/win32/icon.ico     | Bin
 {src => res}/win32/manifest.xml |   0
 src/CMakeLists.txt              |   3 +--
 src/win32/resource.rc           |   6 ------
 5 files changed, 5 insertions(+), 8 deletions(-)
 rename {src => res}/win32/icon.ico (100%)
 rename {src => res}/win32/manifest.xml (100%)
 delete mode 100644 src/win32/resource.rc

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index a99057e..1704a33 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -97,6 +97,10 @@ else() # Unix
 endif()
 
 # Second, register all resources.
+if(WIN32)
+    add_resource(win32/icon.ico     RT_ICON_GROUP APP_ICON)
+    add_resource(win32/manifest.xml RT_MANIFEST   APP_MANIFEST)
+endif()
 add_resource(banner.txt)
 
 # Third, distribute the resources.
diff --git a/src/win32/icon.ico b/res/win32/icon.ico
similarity index 100%
rename from src/win32/icon.ico
rename to res/win32/icon.ico
diff --git a/src/win32/manifest.xml b/res/win32/manifest.xml
similarity index 100%
rename from src/win32/manifest.xml
rename to res/win32/manifest.xml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 488288d..4179de8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -129,8 +129,7 @@ set(generated_SOURCES
 
 if(WIN32)
     set(platform_SOURCES
-        win32/w32main.cpp
-        win32/resource.rc)
+        win32/w32main.cpp)
 
     set(platform_LIBRARIES
         comctl32)
diff --git a/src/win32/resource.rc b/src/win32/resource.rc
deleted file mode 100644
index e402f8b..0000000
--- a/src/win32/resource.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-// we need a manifest if we want visual styles; put in numbers since somethings a bit screwy
-// with my SDK install (I don't think I've got *.rh right)
-1 24 "manifest.xml"
-
-4000 ICON "icon.ico"