Skip to content

Commit 7d26851

Browse files
committed
Add windows application icon (VS)
Remove incorrect ico dependencies from vcxproj part 2 .
1 parent f5e4552 commit 7d26851

File tree

6 files changed

+52
-20
lines changed

6 files changed

+52
-20
lines changed

DobieStation/DobieStation.aps

118 KB
Binary file not shown.

DobieStation/DobieStation.rc

3.21 KB
Binary file not shown.

DobieStation/DobieStation.vcxproj

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
<ClCompile Include="..\src\qt\emuwindow.cpp" />
165165
<ClCompile Include="..\src\qt\renderwidget.cpp" />
166166
<ClCompile Include="..\src\qt\settingswindow.cpp" />
167-
<ClCompile Include="..\src\qt\gamelistwidget.cpp" />
167+
<ClCompile Include="..\src\qt\gamelistwidget.cpp" />
168168
<ClCompile Include="..\src\qt\bios.cpp" />
169169
<ClCompile Include="..\src\core\errors.cpp" />
170170
<ClCompile Include="..\src\core\iop\gamepad.cpp" />
@@ -207,24 +207,24 @@
207207
<ClCompile Include="..\src\core\ee\vu_jit.cpp" />
208208
<ClCompile Include="..\src\core\ee\vu_jit64.cpp" />
209209
<ClCompile Include="..\src\core\ee\vu_jittrans.cpp" />
210-
<ClCompile Include="..\src\core\scheduler.cpp" />
210+
<ClCompile Include="..\src\core\scheduler.cpp" />
211211
</ItemGroup>
212212
<!-- moc files -->
213213
<ItemGroup>
214-
<QtMoc Include="..\src\qt\settings.hpp" />
214+
<QtMoc Include="..\src\qt\settings.hpp" />
215215
<QtMoc Include="..\src\qt\emuthread.hpp" />
216216
<QtMoc Include="..\src\qt\emuwindow.hpp" />
217217
<QtMoc Include="..\src\qt\renderwidget.hpp" />
218218
<QtMoc Include="..\src\qt\settingswindow.hpp" />
219-
<QtMoc Include="..\src\qt\gamelistwidget.hpp" />
219+
<QtMoc Include="..\src\qt\gamelistwidget.hpp" />
220220
</ItemGroup>
221221
<ItemGroup>
222-
<ClCompile Include="$(QtMocOutPrefix)settings.cpp" />
222+
<ClCompile Include="$(QtMocOutPrefix)settings.cpp" />
223223
<ClCompile Include="$(QtMocOutPrefix)emuthread.cpp" />
224224
<ClCompile Include="$(QtMocOutPrefix)emuwindow.cpp" />
225-
<ClCompile Include="$(QtMocOutPrefix)renderwidget.cpp" />
225+
<ClCompile Include="$(QtMocOutPrefix)renderwidget.cpp" />
226226
<ClCompile Include="$(QtMocOutPrefix)settingswindow.cpp" />
227-
<ClCompile Include="$(QtMocOutPrefix)gamelistwidget.cpp" />
227+
<ClCompile Include="$(QtMocOutPrefix)gamelistwidget.cpp" />
228228
</ItemGroup>
229229
<!-- headers -->
230230
<ItemGroup>
@@ -286,7 +286,8 @@
286286
<ClInclude Include="..\src\core\ee\vu_jit.hpp" />
287287
<ClInclude Include="..\src\core\ee\vu_jit64.hpp" />
288288
<ClInclude Include="..\src\core\ee\vu_jittrans.hpp" />
289-
<ClInclude Include="..\src\core\scheduler.hpp" />
289+
<ClInclude Include="..\src\core\scheduler.hpp" />
290+
<ClInclude Include="resource.h" />
290291
</ItemGroup>
291292
<!-- jit stuff -->
292293
<ItemGroup>
@@ -296,6 +297,12 @@
296297
<ItemGroup>
297298
<MASM Include="..\src\core\ee\vu_jit_asm.asm" />
298299
</ItemGroup>
300+
<ItemGroup>
301+
<ResourceCompile Include="DobieStation.rc" />
302+
</ItemGroup>
303+
<ItemGroup>
304+
<Image Include="windows\appicon.ico" />
305+
</ItemGroup>
299306
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
300307
<ImportGroup Label="ExtensionTargets">
301308
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />

DobieStation/DobieStation.vcxproj.filters

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -243,26 +243,26 @@
243243
</ClCompile>
244244
<ClCompile Include="$(QtMocOutPrefix)emuwindow.cpp">
245245
<Filter>Generated Files</Filter>
246-
</ClCompile>
247-
<ClCompile Include="$(QtMocOutPrefix)renderwidget.cpp">
246+
</ClCompile>
247+
<ClCompile Include="$(QtMocOutPrefix)renderwidget.cpp">
248248
<Filter>Generated Files</Filter>
249-
</ClCompile>
250-
<ClCompile Include="$(QtMocOutPrefix)settingswindow.cpp">
249+
</ClCompile>
250+
<ClCompile Include="$(QtMocOutPrefix)settingswindow.cpp">
251251
<Filter>Generated Files</Filter>
252-
</ClCompile>
253-
<ClCompile Include="$(QtMocOutPrefix)settings.cpp">
252+
</ClCompile>
253+
<ClCompile Include="$(QtMocOutPrefix)settings.cpp">
254254
<Filter>Generated Files</Filter>
255-
</ClCompile>
256-
<ClCompile Include="$(QtMocOutPrefix)gamelistwidget.cpp">
255+
</ClCompile>
256+
<ClCompile Include="$(QtMocOutPrefix)gamelistwidget.cpp">
257257
<Filter>Generated Files</Filter>
258-
</ClCompile>
258+
</ClCompile>
259259
<ClCompile Include="..\src\qt\renderwidget.cpp">
260260
<Filter>Source Files</Filter>
261261
</ClCompile>
262262
<ClCompile Include="..\src\qt\settingswindow.cpp">
263263
<Filter>Source Files</Filter>
264264
</ClCompile>
265-
<ClCompile Include="..\src\qt\gamelistwidget.cpp">
265+
<ClCompile Include="..\src\qt\gamelistwidget.cpp">
266266
<Filter>Source Files</Filter>
267267
</ClCompile>
268268
<ClCompile Include="..\src\qt\bios.cpp">
@@ -447,6 +447,9 @@
447447
<ClInclude Include="..\src\qt\bios.hpp">
448448
<Filter>Header Files</Filter>
449449
</ClInclude>
450+
<ClInclude Include="resource.h">
451+
<Filter>Generated Files</Filter>
452+
</ClInclude>
450453
</ItemGroup>
451454
<ItemGroup>
452455
<None Include="..\src\core\jitcommon\ir_instrlist.inc">
@@ -472,11 +475,17 @@
472475
<QtMoc Include="..\src\qt\emuwindow.hpp">
473476
<Filter>Header Files</Filter>
474477
</QtMoc>
475-
<QtMoc Include="..\src\qt\settings.hpp">
478+
<QtMoc Include="..\src\qt\settings.hpp">
476479
<Filter>Header Files</Filter>
477480
</QtMoc>
478-
<QtMoc Include="..\src\qt\gamelistwidget.hpp">
481+
<QtMoc Include="..\src\qt\gamelistwidget.hpp">
479482
<Filter>Header Files</Filter>
480483
</QtMoc>
481484
</ItemGroup>
485+
<ItemGroup>
486+
<ResourceCompile Include="DobieStation.rc" />
487+
</ItemGroup>
488+
<ItemGroup>
489+
<Image Include="windows\appicon.ico" />
490+
</ItemGroup>
482491
</Project>

DobieStation/resource.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//{{NO_DEPENDENCIES}}
2+
// Microsoft Visual C++ generated include file.
3+
// Used by DobieStation.rc
4+
//
5+
#define IDI_ICON1 108
6+
7+
// Next default values for new objects
8+
//
9+
#ifdef APSTUDIO_INVOKED
10+
#ifndef APSTUDIO_READONLY_SYMBOLS
11+
#define _APS_NEXT_RESOURCE_VALUE 109
12+
#define _APS_NEXT_COMMAND_VALUE 40001
13+
#define _APS_NEXT_CONTROL_VALUE 1001
14+
#define _APS_NEXT_SYMED_VALUE 101
15+
#endif
16+
#endif

DobieStation/windows/appicon.ico

361 KB
Binary file not shown.

0 commit comments

Comments
 (0)