Skip to content

Commit d01a91e

Browse files
committed
Fix Qt vcxproj to allow compiling
1 parent 1d4b465 commit d01a91e

File tree

1 file changed

+26
-15
lines changed

1 file changed

+26
-15
lines changed

Source/Core/DolphinQt/DolphinQt.vcxproj

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<PropertyGroup Label="Globals">
66
<ProjectGuid>{FA3FA62B-6F58-4B86-9453-4D149940A066}</ProjectGuid>
77
<ProjectName>Dolphin</ProjectName>
8+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
89
</PropertyGroup>
910
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1011
<Import Project="$(VSPropsDir)Configuration.Application.props" />
@@ -17,6 +18,12 @@
1718
<Import Project="$(VSPropsDir)QtCompile.props" />
1819
</ImportGroup>
1920
<PropertyGroup Label="UserMacros" />
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
22+
<TargetName>Dolphin-MPN</TargetName>
23+
</PropertyGroup>
24+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
25+
<TargetName>Dolphin-MPN</TargetName>
26+
</PropertyGroup>
2027
<ItemDefinitionGroup>
2128
<ClCompile>
2229
<AdditionalIncludeDirectories>$(ProjectDir)Config\Graphics;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -32,17 +39,23 @@
3239
<AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3340
<AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3441
<!--Qt 6.3.0 headers use std::aligned_storage instead of alignas-->
35-
<PreprocessorDefinitions>_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
42+
<PreprocessorDefinitions>_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3643
<!--Jump through some hoops to generate a pch file local to this project-->
3744
<AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3845
<PrecompiledHeader>Use</PrecompiledHeader>
3946
<PrecompiledHeaderFile>pch_qt.h</PrecompiledHeaderFile>
4047
<ForcedIncludeFiles>pch_qt.h</ForcedIncludeFiles>
48+
<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError>
4149
</ClCompile>
4250
<Manifest>
4351
<AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
4452
</Manifest>
4553
</ItemDefinitionGroup>
54+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
55+
<ClCompile>
56+
<TreatWarningAsError>false</TreatWarningAsError>
57+
</ClCompile>
58+
</ItemDefinitionGroup>
4659
<ItemGroup>
4760
<ClCompile Include="AboutDialog.cpp" />
4861
<ClCompile Include="CheatSearchFactoryWidget.cpp" />
@@ -174,8 +187,8 @@
174187
<ClCompile Include="InfinityBase/InfinityBaseWindow.cpp" />
175188
<ClCompile Include="Main.cpp" />
176189
<ClCompile Include="MainWindow.cpp" />
177-
<ClCompile Include="ProjectPlus/DownloadUpdateDialog.cpp" />
178-
<ClCompile Include="ProjectPlus/DownloadWorker.cpp" />
190+
<ClCompile Include="ProjectPlus/DownloadUpdateDialog.cpp" />
191+
<ClCompile Include="ProjectPlus/DownloadWorker.cpp" />
179192
<ClCompile Include="ProjectPlus/InstallUpdateDialog.cpp" />
180193
<ClCompile Include="ProjectPlus/UpdateDialog.cpp" />
181194
<ClCompile Include="MenuBar.cpp" />
@@ -395,8 +408,8 @@
395408
<QtMoc Include="HotkeyScheduler.h" />
396409
<QtMoc Include="InfinityBase/InfinityBaseWindow.h" />
397410
<QtMoc Include="MainWindow.h" />
398-
<QtMoc Include="ProjectPlus/DownloadUpdateDialog.h" />
399-
<QtMoc Include="ProjectPlus/DownloadWorker.h" />
411+
<QtMoc Include="ProjectPlus/DownloadUpdateDialog.h" />
412+
<QtMoc Include="ProjectPlus/DownloadWorker.h" />
400413
<QtMoc Include="ProjectPlus/InstallUpdateDialog.h" />
401414
<QtMoc Include="ProjectPlus/UpdateDialog.h" />
402415
<QtMoc Include="MenuBar.h" />
@@ -463,9 +476,6 @@
463476
<ProjectReference Include="$(CoreDir)DolphinLib.vcxproj">
464477
<Project>{D79392F7-06D6-4B4B-A39F-4D587C215D3A}</Project>
465478
</ProjectReference>
466-
<ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
467-
<Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
468-
</ProjectReference>
469479
<ProjectReference Include="$(DolphinRootDir)Languages\Languages.vcxproj">
470480
<Project>{0e033be3-2e08-428e-9ae9-bc673efa12b5}</Project>
471481
</ProjectReference>
@@ -501,20 +511,21 @@
501511
<ImportGroup Label="ExtensionTargets" />
502512
<!--Copy Exe, Data directory and DLLs which should be located in the executable directory-->
503513
<ItemGroup>
514+
<!---<DataSysFiles Include="$(DolphinRootDir)Data\**\Extras\**\*.*" />-->
504515
<DataSysFiles Include="$(DolphinRootDir)Data\**\Games\**\*.*" />
505516
<DataSysFiles Include="$(DolphinRootDir)Data\**\Launcher\**\*.*" />
506-
<DataSysFiles Include="$(DolphinRootDir)Data\**\Sys\**\*.*" />
507-
<DataUserFiles Include="$(DolphinRootDir)Data\**\User\**\*.*" />
517+
<DataSysFiles Include="$(DolphinRootDir)Data\**\Sys\**\*.*" />
518+
<DataUserFiles Include="$(DolphinRootDir)Data\**\User\**\*.*" />
508519
<DataTxtFiles Include="$(DolphinRootDir)Data\license.txt" />
509-
<DataTxtFiles Include="$(DolphinRootDir)Data\portable.txt" />
520+
<DataTxtFiles Include="$(DolphinRootDir)Data\portable.txt" />
510521
<BinaryFiles Include="$(TargetPath)" />
511-
<AllInputFiles Include="@(DataSysFiles);@(DataTxtFiles);@(BinaryFiles)" />
522+
<AllInputFiles Include="@(DataSysFiles);@(DataUserFiles);@(DataTxtFiles);@(BinaryFiles)" />
512523
</ItemGroup>
513524
<Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)')">
514525
<Message Text="Copying Data directory..." Importance="High" />
515-
<RemoveDir Directories="$(BinaryOutputDir)Sys" />
516-
<Copy SourceFiles="@(DataSysFiles)" DestinationFolder="$(BinaryOutputDir)%(RecursiveDir)" SkipUnchangedFiles="True" />
517-
<Copy SourceFiles="@(DataTxtFiles)" DestinationFolder="$(BinaryOutputDir)" SkipUnchangedFiles="True" />
526+
<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)" />
527+
<Copy SourceFiles="@(DataUserFiles)" 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)" />
528+
<Copy SourceFiles="@(DataTxtFiles)" DestinationFolder="$(BinaryOutputDir)" Condition="!Exists('$(BinaryOutputDir)%(Filename)%(DataTxtFiles.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataTxtFiles.Extension)').Ticks)" />
518529
<Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
519530
<Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
520531
</Target>

0 commit comments

Comments
 (0)