MSIX: add a dedicated .rc for UWPUI which joins both UI and DLL .rc's (…

…#1139)
microsoft · Jan 23, 2020 · f8bcf52 · f8bcf52
1 parent 1a10366
commit f8bcf52
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 2 deletions.
diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc b/src/modules/powerrename/UWPui/PowerRenameUWPUI.rc
@@ -0,0 +1,64 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+// We need both DLL and UI resource files for UWP UI.
+#include "..\dll\PowerRenameExt.rc"
+#undef IDC_STATIC
+#include "..\ui\PowerRenameUI.rc"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE 9, 1
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE  
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE  
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE  
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj
@@ -117,7 +117,7 @@
     <Image Include="..\ui\PowerRename.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\ui\PowerRenameUI.rc" />
+    <ResourceCompile Include="PowerRenameUWPUI.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters b/src/modules/powerrename/UWPui/PowerRenameUWPUI.vcxproj.filters
@@ -42,7 +42,7 @@
     </Image>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\ui\PowerRenameUI.rc">
+    <ResourceCompile Include="PowerRenameUWPUI.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>