Cleaned up resources on Windows. Now to do so for tester.

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
 

windows/resources.rc

@@ -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

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"