WIP - Cleanup after merge #1

This commit is contained in:
Dimitris Panokostas 2017-09-18 12:54:23 +02:00
parent a2850730e0
commit 05387498c0
25 changed files with 325 additions and 359 deletions

View file

@ -104,25 +104,16 @@
<Image Include="..\data\file.ico">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="..\data\joystick.bmp">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="..\data\joystick.ico">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="..\data\misc.ico">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="..\data\mouse.bmp">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="..\data\paths.ico">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="..\data\quickstart.ico" />
<Image Include="..\data\remapping.bmp">
<DeploymentContent>true</DeploymentContent>
</Image>
<Image Include="..\data\savestate.png">
<DeploymentContent>true</DeploymentContent>
</Image>
@ -134,9 +125,6 @@
</Image>
</ItemGroup>
<ItemGroup>
<Font Include="..\data\FreeSans.ttf">
<DeploymentContent>true</DeploymentContent>
</Font>
<Font Include="..\data\Topaznew.ttf">
<DeploymentContent>true</DeploymentContent>
</Font>
@ -527,6 +515,7 @@
<ClInclude Include="..\src\archivers\wrp\warp.h" />
<ClInclude Include="..\src\archivers\zip\unzip.h" />
<ClInclude Include="..\src\include\akiko.h" />
<ClInclude Include="..\src\include\ar.h" />
<ClInclude Include="..\src\include\audio.h" />
<ClInclude Include="..\src\include\autoconf.h" />
<ClInclude Include="..\src\include\blit.h" />

View file

@ -110,24 +110,15 @@
<Image Include="..\data\file.ico">
<Filter>data</Filter>
</Image>
<Image Include="..\data\joystick.bmp">
<Filter>data</Filter>
</Image>
<Image Include="..\data\joystick.ico">
<Filter>data</Filter>
</Image>
<Image Include="..\data\misc.ico">
<Filter>data</Filter>
</Image>
<Image Include="..\data\mouse.bmp">
<Filter>data</Filter>
</Image>
<Image Include="..\data\paths.ico">
<Filter>data</Filter>
</Image>
<Image Include="..\data\remapping.bmp">
<Filter>data</Filter>
</Image>
<Image Include="..\data\savestate.png">
<Filter>data</Filter>
</Image>
@ -148,9 +139,6 @@
</Image>
</ItemGroup>
<ItemGroup>
<Font Include="..\data\FreeSans.ttf">
<Filter>data</Filter>
</Font>
<Font Include="..\data\Topaznew.ttf">
<Filter>data</Filter>
</Font>
@ -1241,6 +1229,9 @@
<ClInclude Include="..\src\archivers\mp2\kjmp2.h">
<Filter>src\archivers\mp2</Filter>
</ClInclude>
<ClInclude Include="..\src\include\ar.h">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\src\archivers\7z\7zVersion.rc">