From f2ce4c8f564970b24374bf7b2db13e8e243973a7 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sat, 1 Jun 2019 10:29:48 -0400
Subject: [PATCH] Split the shared and static resources on the Windows tester,
 for the same reason.

---
 test/meson.build                                    |  8 ++------
 test/resources.rc                                   | 13 -------------
 test/resources_shared.rc                            |  9 +++++++++
 test/resources_static.rc                            |  8 ++++++++
 test/{test.manifest => test_shared.manifest}        |  0
 test/{test.static.manifest => test_static.manifest} |  0
 6 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 test/resources.rc
 create mode 100644 test/resources_shared.rc
 create mode 100644 test/resources_static.rc
 rename test/{test.manifest => test_shared.manifest} (100%)
 rename test/{test.static.manifest => test_static.manifest} (100%)

diff --git a/test/meson.build b/test/meson.build
index ff816ddd..3b1b76c7 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -8,14 +8,10 @@ libui_test_sources = [
 ]
 
 if libui_OS == 'windows'
-	libui_test_manifest = 'test.manifest'
-	if libui_mode == 'static'
-		libui_test_manifest = 'test.static.manifest'
-	endif
 	libui_test_sources += [
-		windows.compile_resources('resources.rc',
+		windows.compile_resources('resources_' + libui_mode + '.rc',
 			args: libui_manifest_args,
-			depend_files: [libui_test_manifest]),
+			depend_files: ['test_' + libui_mode + '.manifest']),
 	]
 endif
 
diff --git a/test/resources.rc b/test/resources.rc
deleted file mode 100644
index 71d1d573..00000000
--- a/test/resources.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-// 30 may 2015
-
-// this is a UTF-8 file
-#pragma code_page(65001)
-
-// this is the Common Controls 6 manifest
-// 1 is the value of CREATEPROCESS_MANIFEST_RESOURCE_ID and 24 is the value of RT_MANIFEST; we use it directly to avoid needing to share winapi.h with the tests and examples
-// we also don't define Common Controls v6 in the shared manifest to ensure that the isolation awareness actually does work
-#ifndef uiStatic
-1 24 "test.manifest"
-#else
-1 24 "test.static.manifest"
-#endif
diff --git a/test/resources_shared.rc b/test/resources_shared.rc
new file mode 100644
index 00000000..318de14d
--- /dev/null
+++ b/test/resources_shared.rc
@@ -0,0 +1,9 @@
+// 30 may 2015
+
+// This is a UTF-8 file.
+#pragma code_page(65001)
+
+// This is the Common Controls 6 manifest.
+// 1 is the value of CREATEPROCESS_MANIFEST_RESOURCE_ID and 24 is the value of RT_MANIFEST; we use it directly to avoid needing to share winapi.h with the tests and examples.
+// We also don't define Common Controls v6 in the test program's shared manifest to ensure that the isolation awareness actually does work.
+1 24 "test_shared.manifest"
diff --git a/test/resources_static.rc b/test/resources_static.rc
new file mode 100644
index 00000000..1c9b676b
--- /dev/null
+++ b/test/resources_static.rc
@@ -0,0 +1,8 @@
+// 30 may 2015
+
+// This is a UTF-8 file.
+#pragma code_page(65001)
+
+// This is the Common Controls 6 manifest.
+// 1 is the value of CREATEPROCESS_MANIFEST_RESOURCE_ID and 24 is the value of RT_MANIFEST; we use it directly to avoid needing to share winapi.h with the tests and examples.
+1 24 "test_static.manifest"
diff --git a/test/test.manifest b/test/test_shared.manifest
similarity index 100%
rename from test/test.manifest
rename to test/test_shared.manifest
diff --git a/test/test.static.manifest b/test/test_static.manifest
similarity index 100%
rename from test/test.static.manifest
rename to test/test_static.manifest