From a8cd121003bae103fcfa31591a7894e8301aa4d3 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sat, 1 Jun 2019 10:24:32 -0400
Subject: [PATCH] Cleaned up resources on Windows. Now to do so for tester.

---
 windows/{libui.manifest => libui_shared.manifest} |  0
 windows/meson.build                               |  4 ++--
 windows/resources.rc                              | 11 -----------
 windows/resources_shared.rc                       |  9 +++++++++
 4 files changed, 11 insertions(+), 13 deletions(-)
 rename windows/{libui.manifest => libui_shared.manifest} (100%)
 delete mode 100644 windows/resources.rc
 create mode 100644 windows/resources_shared.rc

diff --git a/windows/libui.manifest b/windows/libui_shared.manifest
similarity index 100%
rename from windows/libui.manifest
rename to windows/libui_shared.manifest
diff --git a/windows/meson.build b/windows/meson.build
index af352de3..15389b75 100644
--- a/windows/meson.build
+++ b/windows/meson.build
@@ -14,9 +14,9 @@ libui_sources += [
 # In those cases, we just need them to include the manifest with the executable (or link it directly into the output executable themselves); they can also customize the manifest as they see fit (assuming nothing breaks in the process).
 if libui_mode == 'shared'
 	libui_sources += [
-		windows.compile_resources('resources.rc',
+		windows.compile_resources('resources_shared.rc',
 			args: libui_manifest_args,
-			depend_files: ['libui.manifest']),
+			depend_files: ['libui_shared.manifest']),
 	]
 endif
 
diff --git a/windows/resources.rc b/windows/resources.rc
deleted file mode 100644
index 137147fc..00000000
--- a/windows/resources.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-// 30 may 2015
-#include "winapi.hpp"
-
-// this is a UTF-8 file
-#pragma code_page(65001)
-
-// this is the Common Controls 6 manifest
-// we only define it in a shared build; static builds have to include the appropriate parts of the manifest in the output executable
-#ifndef uiStatic
-ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "libui.manifest"
-#endif
diff --git a/windows/resources_shared.rc b/windows/resources_shared.rc
new file mode 100644
index 00000000..e87579d6
--- /dev/null
+++ b/windows/resources_shared.rc
@@ -0,0 +1,9 @@
+// 30 may 2015
+#include "winapi.hpp"
+
+// This is a UTF-8 file.
+#pragma code_page(65001)
+
+// The only actual resource in our DLLs is the Common Controls 6 manifest.
+// Any other resources need to be converted to source code in order to be usable from the static library version of libui; that process will come later.
+ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "libui_shared.manifest"