ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

msbuild: Remove hack for ObjectFileName (reduces build parallelism).

This commit is contained in:
Shawn Hoffman 2017-06-06 22:02:38 -07:00
parent 1bb26dddb1
commit 8d37301b19
6 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/CMakeLists.txt
View File

@ -173,7 +173,7 @@ set(SRCS
IOS/Network/KD/NetKDRequest.cpp IOS/Network/KD/NetKDRequest.cpp
IOS/Network/KD/NetKDTime.cpp IOS/Network/KD/NetKDTime.cpp
IOS/Network/KD/NWC24Config.cpp IOS/Network/KD/NWC24Config.cpp
IOS/Network/NCD/Config.cpp IOS/Network/NCD/WiiNetConfig.cpp
IOS/Network/NCD/Manage.cpp IOS/Network/NCD/Manage.cpp
IOS/Network/WD/Command.cpp IOS/Network/WD/Command.cpp
IOS/SDIO/SDIOSlot0.cpp IOS/SDIO/SDIOSlot0.cpp

14
Source/Core/Core/Core.vcxproj
View File

@ -35,16 +35,6 @@
<Import Project="..\..\VSProps\PCHUse.props" /> <Import Project="..\..\VSProps\PCHUse.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="ActionReplay.cpp" /> <ClCompile Include="ActionReplay.cpp" />
<ClCompile Include="Analytics.cpp" /> <ClCompile Include="Analytics.cpp" />
@ -214,7 +204,7 @@
<ClCompile Include="IOS\Network\KD\NetKDRequest.cpp" /> <ClCompile Include="IOS\Network\KD\NetKDRequest.cpp" />
<ClCompile Include="IOS\Network\KD\NetKDTime.cpp" /> <ClCompile Include="IOS\Network\KD\NetKDTime.cpp" />
<ClCompile Include="IOS\Network\KD\NWC24Config.cpp" /> <ClCompile Include="IOS\Network\KD\NWC24Config.cpp" />
<ClCompile Include="IOS\Network\NCD\Config.cpp" /> <ClCompile Include="IOS\Network\NCD\WiiNetConfig.cpp" />
<ClCompile Include="IOS\Network\NCD\Manage.cpp" /> <ClCompile Include="IOS\Network\NCD\Manage.cpp" />
<ClCompile Include="IOS\Network\WD\Command.cpp" /> <ClCompile Include="IOS\Network\WD\Command.cpp" />
<ClCompile Include="IOS\SDIO\SDIOSlot0.cpp" /> <ClCompile Include="IOS\SDIO\SDIOSlot0.cpp" />
@ -460,7 +450,7 @@
<ClInclude Include="IOS\Network\KD\NetKDRequest.h" /> <ClInclude Include="IOS\Network\KD\NetKDRequest.h" />
<ClInclude Include="IOS\Network\KD\NetKDTime.h" /> <ClInclude Include="IOS\Network\KD\NetKDTime.h" />
<ClInclude Include="IOS\Network\KD\NWC24Config.h" /> <ClInclude Include="IOS\Network\KD\NWC24Config.h" />
<ClInclude Include="IOS\Network\NCD\Config.h" /> <ClInclude Include="IOS\Network\NCD\WiiNetConfig.h" />
<ClInclude Include="IOS\Network\NCD\Manage.h" /> <ClInclude Include="IOS\Network\NCD\Manage.h" />
<ClInclude Include="IOS\Network\WD\Command.h" /> <ClInclude Include="IOS\Network\WD\Command.h" />
<ClInclude Include="IOS\SDIO\SDIOSlot0.h" /> <ClInclude Include="IOS\SDIO\SDIOSlot0.h" />

12
Source/Core/Core/Core.vcxproj.filters
View File

@ -778,9 +778,6 @@
<ClCompile Include="IOS\Network\KD\NWC24Config.cpp"> <ClCompile Include="IOS\Network\KD\NWC24Config.cpp">
<Filter>IOS\Network\KD</Filter> <Filter>IOS\Network\KD</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="IOS\Network\NCD\Config.cpp">
<Filter>IOS\Network\NCD</Filter>
</ClCompile>
<ClCompile Include="IOS\Network\NCD\Manage.cpp"> <ClCompile Include="IOS\Network\NCD\Manage.cpp">
<Filter>IOS\Network\NCD</Filter> <Filter>IOS\Network\NCD</Filter>
</ClCompile> </ClCompile>
@ -858,6 +855,9 @@
</ClCompile> </ClCompile>
<ClCompile Include="Config\Config.cpp" /> <ClCompile Include="Config\Config.cpp" />
<ClCompile Include="Config\GraphicsSettings.cpp" /> <ClCompile Include="Config\GraphicsSettings.cpp" />
<ClCompile Include="IOS\Network\NCD\WiiNetConfig.cpp">
<Filter>IOS\Network\NCD</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="BootManager.h" /> <ClInclude Include="BootManager.h" />
@ -1404,9 +1404,6 @@
<ClInclude Include="IOS\Network\KD\NWC24Config.h"> <ClInclude Include="IOS\Network\KD\NWC24Config.h">
<Filter>IOS\Network\KD</Filter> <Filter>IOS\Network\KD</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="IOS\Network\NCD\Config.h">
<Filter>IOS\Network\NCD</Filter>
</ClInclude>
<ClInclude Include="IOS\Network\NCD\Manage.h"> <ClInclude Include="IOS\Network\NCD\Manage.h">
<Filter>IOS\Network\NCD</Filter> <Filter>IOS\Network\NCD</Filter>
</ClInclude> </ClInclude>
@ -1499,6 +1496,9 @@
<ClInclude Include="ConfigLoaders\IsSettingSaveable.h"> <ClInclude Include="ConfigLoaders\IsSettingSaveable.h">
<Filter>ConfigLoader</Filter> <Filter>ConfigLoader</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="IOS\Network\NCD\WiiNetConfig.h">
<Filter>IOS\Network\NCD</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Text Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />

2
Source/Core/Core/IOS/Network/NCD/Manage.h
View File

@ -8,7 +8,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IOS/Device.h" #include "Core/IOS/Device.h"
#include "Core/IOS/Network/NCD/Config.h" #include "Core/IOS/Network/NCD/WiiNetConfig.h"
namespace IOS namespace IOS
{ {

2
Source/Core/Core/IOS/Network/NCD/Config.cpp → Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Core/IOS/Network/NCD/Config.h" #include "Core/IOS/Network/NCD/WiiNetConfig.h"
#include <cstring> #include <cstring>

0
Source/Core/Core/IOS/Network/NCD/Config.h → Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h
View File