refactor(resource.h): unify resource.h

Author: nameoverflow

WeaselServer/WeaselServer.vcxproj

@@ -466,7 +466,6 @@
     <ClCompile Include="WeaselTrayIcon.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="SystemTraySDK.h" />
     <ClInclude Include="WeaselServerApp.h" />

WeaselServer/WeaselServer.vcxproj.filters

@@ -35,9 +35,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>

WeaselServer/WeaselTrayIcon.cpp

@@ -2,7 +2,7 @@
 #include "WeaselTrayIcon.h"
 
 // nasty
-#include "../WeaselServer/resource.h"
+#include <resource.h>
 
 static UINT mode_icon[] = { IDI_ZH, IDI_ZH, IDI_EN, IDI_RELOAD };
 static const WCHAR *mode_label[] = { NULL, /*L"中文"*/ NULL, /*L"西文"*/ NULL, L"維護中" };

WeaselServer/resource.h

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "resource.h"
+#include <resource.h>
 #include "WeaselTSF.h"
 
 static const DWORD LANGBARITEMSINK_COOKIE = 0x42424242;

WeaselTSF/LanguageBar.cpp

@@ -440,7 +440,6 @@
     <ClInclude Include="Globals.h" />
     <ClInclude Include="KeyEvent.h" />
     <ClInclude Include="Register.h" />
-    <ClInclude Include="resource.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="WeaselTSF.h" />

WeaselTSF/WeaselTSF.vcxproj

@@ -83,9 +83,6 @@
     <ClInclude Include="EditSession.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="CandidateList.h">
       <Filter>Header Files</Filter>
     </ClInclude>

WeaselTSF/WeaselTSF.vcxproj.filters

@@ -8,7 +8,7 @@
 #include "FullScreenLayout.h"
 
 // for IDI_ZH, IDI_EN
-#include "../WeaselServer/resource.h"
+#include <resource.h>
 
 using namespace weasel;
 

WeaselUI/WeaselPanel.cpp

@@ -1,13 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{53F79A24-5390-4640-84B5-19984EB3353B}"
 	ProjectSection(SolutionItems) = preProject
 		include\ComPtr.h = include\ComPtr.h
 		include\PipeChannel.h = include\PipeChannel.h
 		include\PyWeasel.h = include\PyWeasel.h
+		include\resource.h = include\resource.h
 		include\ResponseParser.h = include\ResponseParser.h
 		include\RimeWithWeasel.h = include\RimeWithWeasel.h
 		include\StringAlgorithm.hpp = include\StringAlgorithm.hpp
@@ -180,4 +181,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {4AFF32D9-6B2D-4B26-93BB-56C9A69ED0C8}
+	EndGlobalSection
 EndGlobal