Merge pull request #5570 from shuffle2/vs-cleanup

Vs cleanup
2017-06-07 18:31:22 -07:00 · 2017-06-07 18:31:22 -07:00 · e6aa118f21
parent d7faba58cc 5dc7318281
commit e6aa118f21
11 changed files with 22 additions and 53 deletions
--- a/Languages/Languages.vcxproj
+++ b/Languages/Languages.vcxproj
@ -45,15 +45,15 @@
    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
    <ConfigurationType>Utility</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@ -173,7 +173,7 @@ set(SRCS
  IOS/Network/KD/NetKDRequest.cpp
  IOS/Network/KD/NetKDTime.cpp
  IOS/Network/KD/NWC24Config.cpp
-  IOS/Network/NCD/Config.cpp
+  IOS/Network/NCD/WiiNetConfig.cpp
  IOS/Network/NCD/Manage.cpp
  IOS/Network/WD/Command.cpp
  IOS/SDIO/SDIOSlot0.cpp
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@ -35,16 +35,6 @@
    <Import Project="..\..\VSProps\PCHUse.props" />
  </ImportGroup>
  <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>
    <ClCompile Include="ActionReplay.cpp" />
    <ClCompile Include="Analytics.cpp" />
@ -214,7 +204,7 @@
    <ClCompile Include="IOS\Network\KD\NetKDRequest.cpp" />
    <ClCompile Include="IOS\Network\KD\NetKDTime.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\WD\Command.cpp" />
    <ClCompile Include="IOS\SDIO\SDIOSlot0.cpp" />
@ -460,7 +450,7 @@
    <ClInclude Include="IOS\Network\KD\NetKDRequest.h" />
    <ClInclude Include="IOS\Network\KD\NetKDTime.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\WD\Command.h" />
    <ClInclude Include="IOS\SDIO\SDIOSlot0.h" />
@ -582,4 +572,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@ -778,9 +778,6 @@
    <ClCompile Include="IOS\Network\KD\NWC24Config.cpp">
      <Filter>IOS\Network\KD</Filter>
    </ClCompile>
-    <ClCompile Include="IOS\Network\NCD\Config.cpp">
-      <Filter>IOS\Network\NCD</Filter>
-    </ClCompile>
    <ClCompile Include="IOS\Network\NCD\Manage.cpp">
      <Filter>IOS\Network\NCD</Filter>
    </ClCompile>
@ -858,6 +855,9 @@
    </ClCompile>
    <ClCompile Include="Config\Config.cpp" />
    <ClCompile Include="Config\GraphicsSettings.cpp" />
+    <ClCompile Include="IOS\Network\NCD\WiiNetConfig.cpp">
+      <Filter>IOS\Network\NCD</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="BootManager.h" />
@ -1404,9 +1404,6 @@
    <ClInclude Include="IOS\Network\KD\NWC24Config.h">
      <Filter>IOS\Network\KD</Filter>
    </ClInclude>
-    <ClInclude Include="IOS\Network\NCD\Config.h">
-      <Filter>IOS\Network\NCD</Filter>
-    </ClInclude>
    <ClInclude Include="IOS\Network\NCD\Manage.h">
      <Filter>IOS\Network\NCD</Filter>
    </ClInclude>
@ -1499,8 +1496,11 @@
    <ClInclude Include="ConfigLoaders\IsSettingSaveable.h">
      <Filter>ConfigLoader</Filter>
    </ClInclude>
+    <ClInclude Include="IOS\Network\NCD\WiiNetConfig.h">
+      <Filter>IOS\Network\NCD</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Text Include="CMakeLists.txt" />
  </ItemGroup>
-</Project>
+</Project>
--- a/Source/Core/Core/IOS/Network/NCD/Manage.h
+++ b/Source/Core/Core/IOS/Network/NCD/Manage.h
@ -8,7 +8,7 @@

 #include "Common/CommonTypes.h"
 #include "Core/IOS/Device.h"
-#include "Core/IOS/Network/NCD/Config.h"
+#include "Core/IOS/Network/NCD/WiiNetConfig.h"

 namespace IOS
 {
--- a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp
+++ b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.

-#include "Core/IOS/Network/NCD/Config.h"
+#include "Core/IOS/Network/NCD/WiiNetConfig.h"

 #include <cstring>

--- a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h
+++ b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
@ -41,15 +41,10 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros">
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
  <ItemDefinitionGroup>
    <Link>
      <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <!--TODO fix up ffmpeg garbage-->
-      <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
    </Link>
    <ClCompile>
      <AdditionalIncludeDirectories>$(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Settings;$(ProjectDir)\Config;$(ProjectDir)\Config\Mapping;$(ProjectDir)\QtUtils;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -58,14 +53,6 @@
      <AdditionalManifestFiles>DolphinQt2.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
    </Manifest>
  </ItemDefinitionGroup>
-  <!--QRC and UI files are handled automatically-->
-  <ItemGroup>
-    <QtResource Include="*.qrc" />
-  </ItemGroup>
-  <ItemGroup>
-    <QtUi Include="*.ui" />
-    <QtUi Include="GameList\*.ui" />
-  </ItemGroup>
  <!--MOC files need to be listed. Perhaps scan for Q_OBJECT in the future? (like automoc)-->
  <!--NOTE: When adding moc'd files, you must list the outputs in the following ItemGroup!-->
  <ItemGroup>
@ -168,11 +155,9 @@
    <ClCompile Include="ToolBar.cpp" />
  </ItemGroup>
  <!--Put standard C/C++ headers here-->
-  <!--
  <ItemGroup>
-    <ClInclude Include="Main.h" />
+    <ClInclude Include="Resources.h" />
  </ItemGroup>
-  -->
  <ItemGroup>
    <Text Include="CMakeLists.txt" />
  </ItemGroup>
@ -247,10 +232,6 @@
    <BinaryFiles Include="$(TargetPath)" />
    <AllInputFiles Include="@(DataSysFiles);@(DataTxtFiles);@(ExternalDlls);@(BinaryFiles)" />
  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Resources.h" />
-  </ItemGroup>
-  <!--Disable copying to binary dir for now on the buildbot to prevent packaging of the outputs-->
  <Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)')">
    <Message Text="Copying Data directory..." Importance="High" />
    <Copy SourceFiles="@(DataSysFiles)" DestinationFolder="$(BinaryOutputDir)%(RecursiveDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataSysFiles.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataSysFiles.Extension)').Ticks)" />
@ -260,4 +241,4 @@
    <Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
    <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
  </Target>
-</Project>
+</Project>
--- a/Source/Core/DolphinWX/DolphinWX.vcxproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj
@ -40,8 +40,6 @@
    <Link>
      <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <!--TODO fix up ffmpeg garbage-->
-      <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
    </Link>
    <ResourceCompile>
      <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@ -48,8 +48,6 @@
      <AdditionalLibraryDirectories>$(ExternalsDir)OpenAL\lib;$(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <SubSystem>Console</SubSystem>
-      <!--TODO fix up ffmpeg garbage-->
-      <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@ -137,6 +137,8 @@
    <Link Condition="'$(ConfigurationType)'=='Application'">
      <!--See Common/ucrtFreadWorkaround.cpp-->
      <ForceSymbolReferences>ucrtFreadWorkaround</ForceSymbolReferences>
+      <!--TODO fix up ffmpeg garbage-->
+      <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
    </Link>
    <Lib>
      <TreatLibWarningAsErrors>true</TreatLibWarningAsErrors>