From 63952a3e20a1a27b0e7a94a47ad9c1ba2f963c61 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 21 Apr 2019 17:59:29 -0400
Subject: [PATCH] ANd integrated the test manifest back into the tester.

---
 test/meson.build                         | 22 +++++++++++-----------
 {zOLD_test => test}/resources.rc         |  1 -
 {zOLD_test => test}/test.manifest        |  0
 {zOLD_test => test}/test.static.manifest |  0
 4 files changed, 11 insertions(+), 12 deletions(-)
 rename {zOLD_test => test}/resources.rc (90%)
 rename {zOLD_test => test}/test.manifest (100%)
 rename {zOLD_test => test}/test.static.manifest (100%)

diff --git a/test/meson.build b/test/meson.build
index f541d43f..9d55e675 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -6,17 +6,17 @@ libui_test_sources = [
 	'testing.c',
 ]
 
-#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',
-#			args: libui_manifest_args,
-#			depend_files: [libui_test_manifest]),
-#	]
-#endif
+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',
+			args: libui_manifest_args,
+			depend_files: [libui_test_manifest]),
+	]
+endif
 
 # TODO once we upgrade to 0.49.0, add pie: true
 # TODO once we upgrade to 0.50.0, add protocol: 'exitcode'
diff --git a/zOLD_test/resources.rc b/test/resources.rc
similarity index 90%
rename from zOLD_test/resources.rc
rename to test/resources.rc
index 9ffb4290..6b46730d 100644
--- a/zOLD_test/resources.rc
+++ b/test/resources.rc
@@ -4,7 +4,6 @@
 #pragma code_page(65001)
 
 // this is the Common Controls 6 manifest
-// TODO set up the string values here
 // 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
 #ifndef uiStatic
 1 24 "test.manifest"
diff --git a/zOLD_test/test.manifest b/test/test.manifest
similarity index 100%
rename from zOLD_test/test.manifest
rename to test/test.manifest
diff --git a/zOLD_test/test.static.manifest b/test/test.static.manifest
similarity index 100%
rename from zOLD_test/test.static.manifest
rename to test/test.static.manifest