Add windows application icon (VS)

Remove incorrect ico dependencies from vcxproj part 2 .
PSI-Rockin · Apr 1, 2019 · 7d26851 · 7d26851
1 parent f5e4552
commit 7d26851
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 20 deletions.
diff --git a/DobieStation/DobieStation.aps b/DobieStation/DobieStation.aps
diff --git a/DobieStation/DobieStation.rc b/DobieStation/DobieStation.rc
diff --git a/DobieStation/DobieStation.vcxproj b/DobieStation/DobieStation.vcxproj
@@ -164,7 +164,7 @@
     <ClCompile Include="..\src\qt\emuwindow.cpp" />
     <ClCompile Include="..\src\qt\renderwidget.cpp" />
     <ClCompile Include="..\src\qt\settingswindow.cpp" />
-	<ClCompile Include="..\src\qt\gamelistwidget.cpp" />
+    <ClCompile Include="..\src\qt\gamelistwidget.cpp" />
     <ClCompile Include="..\src\qt\bios.cpp" />
     <ClCompile Include="..\src\core\errors.cpp" />
     <ClCompile Include="..\src\core\iop\gamepad.cpp" />
@@ -207,24 +207,24 @@
     <ClCompile Include="..\src\core\ee\vu_jit.cpp" />
     <ClCompile Include="..\src\core\ee\vu_jit64.cpp" />
     <ClCompile Include="..\src\core\ee\vu_jittrans.cpp" />
-	<ClCompile Include="..\src\core\scheduler.cpp" />
+    <ClCompile Include="..\src\core\scheduler.cpp" />
   </ItemGroup>
   <!-- moc files -->
   <ItemGroup>
-	<QtMoc Include="..\src\qt\settings.hpp" />
+    <QtMoc Include="..\src\qt\settings.hpp" />
     <QtMoc Include="..\src\qt\emuthread.hpp" />
     <QtMoc Include="..\src\qt\emuwindow.hpp" />
     <QtMoc Include="..\src\qt\renderwidget.hpp" />
     <QtMoc Include="..\src\qt\settingswindow.hpp" />
-	<QtMoc Include="..\src\qt\gamelistwidget.hpp" />
+    <QtMoc Include="..\src\qt\gamelistwidget.hpp" />
   </ItemGroup>
   <ItemGroup>
-	<ClCompile Include="$(QtMocOutPrefix)settings.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)settings.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)emuthread.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)emuwindow.cpp" />
-	<ClCompile Include="$(QtMocOutPrefix)renderwidget.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)renderwidget.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)settingswindow.cpp" />
-	<ClCompile Include="$(QtMocOutPrefix)gamelistwidget.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)gamelistwidget.cpp" />
   </ItemGroup>
   <!-- headers -->
   <ItemGroup>
@@ -286,7 +286,8 @@
     <ClInclude Include="..\src\core\ee\vu_jit.hpp" />
     <ClInclude Include="..\src\core\ee\vu_jit64.hpp" />
     <ClInclude Include="..\src\core\ee\vu_jittrans.hpp" />
-	<ClInclude Include="..\src\core\scheduler.hpp" />
+    <ClInclude Include="..\src\core\scheduler.hpp" />
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <!-- jit stuff -->
   <ItemGroup>
@@ -296,6 +297,12 @@
   <ItemGroup>
     <MASM Include="..\src\core\ee\vu_jit_asm.asm" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="DobieStation.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="windows\appicon.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />

diff --git a/DobieStation/DobieStation.vcxproj.filters b/DobieStation/DobieStation.vcxproj.filters
@@ -243,26 +243,26 @@
     </ClCompile>
     <ClCompile Include="$(QtMocOutPrefix)emuwindow.cpp">
       <Filter>Generated Files</Filter>
-	</ClCompile>
-	<ClCompile Include="$(QtMocOutPrefix)renderwidget.cpp">
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)renderwidget.cpp">
       <Filter>Generated Files</Filter>
-	</ClCompile>
-	<ClCompile Include="$(QtMocOutPrefix)settingswindow.cpp">
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)settingswindow.cpp">
       <Filter>Generated Files</Filter>
-	</ClCompile>
-	<ClCompile Include="$(QtMocOutPrefix)settings.cpp">
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)settings.cpp">
       <Filter>Generated Files</Filter>
-	</ClCompile>
-	<ClCompile Include="$(QtMocOutPrefix)gamelistwidget.cpp">
+    </ClCompile>
+    <ClCompile Include="$(QtMocOutPrefix)gamelistwidget.cpp">
       <Filter>Generated Files</Filter>
-	</ClCompile>
+    </ClCompile>
     <ClCompile Include="..\src\qt\renderwidget.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\qt\settingswindow.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-	<ClCompile Include="..\src\qt\gamelistwidget.cpp">
+    <ClCompile Include="..\src\qt\gamelistwidget.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\qt\bios.cpp">
@@ -447,6 +447,9 @@
     <ClInclude Include="..\src\qt\bios.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Generated Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\src\core\jitcommon\ir_instrlist.inc">
@@ -472,11 +475,17 @@
     <QtMoc Include="..\src\qt\emuwindow.hpp">
       <Filter>Header Files</Filter>
     </QtMoc>
-	<QtMoc Include="..\src\qt\settings.hpp">
+    <QtMoc Include="..\src\qt\settings.hpp">
       <Filter>Header Files</Filter>
     </QtMoc>
-	<QtMoc Include="..\src\qt\gamelistwidget.hpp">
+    <QtMoc Include="..\src\qt\gamelistwidget.hpp">
       <Filter>Header Files</Filter>
     </QtMoc>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="DobieStation.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="windows\appicon.ico" />
+  </ItemGroup>
 </Project>
diff --git a/DobieStation/resource.h b/DobieStation/resource.h
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by DobieStation.rc
+//
+#define IDI_ICON1                       108
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        109
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/DobieStation/windows/appicon.ico b/DobieStation/windows/appicon.ico