From f548f6d4d256b3564528b302d302e63eefdf71e2 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 21 Apr 2019 17:46:50 -0400
Subject: [PATCH] Readded the manifest to libui.dll. The test suite passes!

---
 {zOLD_windows => windows}/libui.manifest |  0
 windows/meson.build                      | 14 +++++++-------
 {zOLD_windows => windows}/resources.rc   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename {zOLD_windows => windows}/libui.manifest (100%)
 rename {zOLD_windows => windows}/resources.rc (92%)

diff --git a/zOLD_windows/libui.manifest b/windows/libui.manifest
similarity index 100%
rename from zOLD_windows/libui.manifest
rename to windows/libui.manifest
diff --git a/windows/meson.build b/windows/meson.build
index e534bc39..952dad7b 100644
--- a/windows/meson.build
+++ b/windows/meson.build
@@ -10,13 +10,13 @@ libui_sources += [
 # For a DLL, we have to include this directly, so we do so.
 # Windows won't link resources in static libraries, so including this would have no effect.
 # 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',
-#			args: libui_manifest_args,
-#			depend_files: ['libui.manifest']),
-#	]
-#endif
+if libui_mode == 'shared'
+	libui_sources += [
+		windows.compile_resources('resources.rc',
+			args: libui_manifest_args,
+			depend_files: ['libui.manifest']),
+	]
+endif
 
 foreach lib : ['user32', 'kernel32', 'gdi32', 'comctl32']
 	libui_deps += [
diff --git a/zOLD_windows/resources.rc b/windows/resources.rc
similarity index 92%
rename from zOLD_windows/resources.rc
rename to windows/resources.rc
index 5c05f983..4a2fd365 100644
--- a/zOLD_windows/resources.rc
+++ b/windows/resources.rc
@@ -1,6 +1,6 @@
 // 30 may 2015
 #include "winapi.hpp"
-#include "resources.hpp"
+//TODO#include "resources.hpp"
 
 // this is a UTF-8 file
 #pragma code_page(65001)