archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5512 from shuffle2/vs-cleanup

Browse source 
VS cleanup
This commit is contained in:
shuffle2 2017-06-03 18:36:01 -07:00 committed by GitHub
commit c2cef72f8b
43 changed files with 99 additions and 424 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\src\SFML\Network\Http.cpp" />
<ClCompile Include="..\..\src\SFML\Network\IPAddress.cpp" />

6
Externals/cpp-optparse/cpp-optparse.vcxproj vendored
View file

@ -35,12 +35,6 @@
<Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="OptionParser.cpp" />
</ItemGroup>

9
Externals/cpp-optparse/cpp-optparse.vcxproj.filters vendored
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="OptionParser.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="OptionParser.h" />
</ItemGroup>
</Project>

4
Externals/cubeb/msvc/cubeb.vcxproj vendored
View file

@ -34,8 +34,8 @@
</ImportGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>../include;../src;../msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;WIN32;USE_WASAPI;USE_WINMM;OUTSIDE_SPEEX;FLOATING_POINT;RANDOM_PREFIX=speex;EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include;..\src;..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;USE_WASAPI;USE_WINMM;OUTSIDE_SPEEX;FLOATING_POINT;RANDOM_PREFIX=speex;EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">

2
Externals/cubeb/msvc/cubeb.vcxproj.filters vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="..\include\cubeb\cubeb.h" />
<ClInclude Include="..\src\cubeb_array_queue.h" />

272
Externals/curl/curl.vcxproj.filters vendored
View file

@ -1,272 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="lib\amigaos.c" />
<ClCompile Include="lib\asyn-ares.c" />
<ClCompile Include="lib\asyn-thread.c" />
<ClCompile Include="lib\base64.c" />
<ClCompile Include="lib\conncache.c" />
<ClCompile Include="lib\connect.c" />
<ClCompile Include="lib\content_encoding.c" />
<ClCompile Include="lib\cookie.c" />
<ClCompile Include="lib\curl_addrinfo.c" />
<ClCompile Include="lib\curl_des.c" />
<ClCompile Include="lib\curl_endian.c" />
<ClCompile Include="lib\curl_fnmatch.c" />
<ClCompile Include="lib\curl_gethostname.c" />
<ClCompile Include="lib\curl_gssapi.c" />
<ClCompile Include="lib\curl_memrchr.c" />
<ClCompile Include="lib\curl_multibyte.c" />
<ClCompile Include="lib\curl_ntlm_core.c" />
<ClCompile Include="lib\curl_ntlm_wb.c" />
<ClCompile Include="lib\curl_rtmp.c" />
<ClCompile Include="lib\curl_sasl.c" />
<ClCompile Include="lib\curl_sspi.c" />
<ClCompile Include="lib\curl_threads.c" />
<ClCompile Include="lib\dict.c" />
<ClCompile Include="lib\dotdot.c" />
<ClCompile Include="lib\easy.c" />
<ClCompile Include="lib\escape.c" />
<ClCompile Include="lib\file.c" />
<ClCompile Include="lib\fileinfo.c" />
<ClCompile Include="lib\formdata.c" />
<ClCompile Include="lib\ftp.c" />
<ClCompile Include="lib\ftplistparser.c" />
<ClCompile Include="lib\getenv.c" />
<ClCompile Include="lib\getinfo.c" />
<ClCompile Include="lib\gopher.c" />
<ClCompile Include="lib\hash.c" />
<ClCompile Include="lib\hmac.c" />
<ClCompile Include="lib\hostasyn.c" />
<ClCompile Include="lib\hostcheck.c" />
<ClCompile Include="lib\hostip.c" />
<ClCompile Include="lib\hostip4.c" />
<ClCompile Include="lib\hostip6.c" />
<ClCompile Include="lib\hostsyn.c" />
<ClCompile Include="lib\http.c" />
<ClCompile Include="lib\http_chunks.c" />
<ClCompile Include="lib\http_digest.c" />
<ClCompile Include="lib\http_negotiate.c" />
<ClCompile Include="lib\http_ntlm.c" />
<ClCompile Include="lib\http_proxy.c" />
<ClCompile Include="lib\http2.c" />
<ClCompile Include="lib\idn_win32.c" />
<ClCompile Include="lib\if2ip.c" />
<ClCompile Include="lib\imap.c" />
<ClCompile Include="lib\inet_ntop.c" />
<ClCompile Include="lib\inet_pton.c" />
<ClCompile Include="lib\krb5.c" />
<ClCompile Include="lib\ldap.c" />
<ClCompile Include="lib\llist.c" />
<ClCompile Include="lib\md4.c" />
<ClCompile Include="lib\md5.c" />
<ClCompile Include="lib\memdebug.c" />
<ClCompile Include="lib\mprintf.c" />
<ClCompile Include="lib\multi.c" />
<ClCompile Include="lib\netrc.c" />
<ClCompile Include="lib\non-ascii.c" />
<ClCompile Include="lib\nonblock.c" />
<ClCompile Include="lib\nwlib.c" />
<ClCompile Include="lib\nwos.c" />
<ClCompile Include="lib\openldap.c" />
<ClCompile Include="lib\parsedate.c" />
<ClCompile Include="lib\pingpong.c" />
<ClCompile Include="lib\pipeline.c" />
<ClCompile Include="lib\pop3.c" />
<ClCompile Include="lib\progress.c" />
<ClCompile Include="lib\rawstr.c" />
<ClCompile Include="lib\rtsp.c" />
<ClCompile Include="lib\security.c" />
<ClCompile Include="lib\select.c" />
<ClCompile Include="lib\sendf.c" />
<ClCompile Include="lib\share.c" />
<ClCompile Include="lib\slist.c" />
<ClCompile Include="lib\smb.c" />
<ClCompile Include="lib\smtp.c" />
<ClCompile Include="lib\socks.c" />
<ClCompile Include="lib\socks_gssapi.c" />
<ClCompile Include="lib\socks_sspi.c" />
<ClCompile Include="lib\speedcheck.c" />
<ClCompile Include="lib\splay.c" />
<ClCompile Include="lib\ssh.c" />
<ClCompile Include="lib\strdup.c" />
<ClCompile Include="lib\strequal.c" />
<ClCompile Include="lib\strerror.c" />
<ClCompile Include="lib\strtok.c" />
<ClCompile Include="lib\strtoofft.c" />
<ClCompile Include="lib\system_win32.c" />
<ClCompile Include="lib\telnet.c" />
<ClCompile Include="lib\tftp.c" />
<ClCompile Include="lib\timeval.c" />
<ClCompile Include="lib\transfer.c" />
<ClCompile Include="lib\url.c" />
<ClCompile Include="lib\version.c" />
<ClCompile Include="lib\warnless.c" />
<ClCompile Include="lib\wildcard.c" />
<ClCompile Include="lib\x509asn1.c" />
<ClCompile Include="lib\vtls\axtls.c" />
<ClCompile Include="lib\vtls\cyassl.c" />
<ClCompile Include="lib\vtls\darwinssl.c" />
<ClCompile Include="lib\vtls\gskit.c" />
<ClCompile Include="lib\vtls\gtls.c" />
<ClCompile Include="lib\vtls\mbedtls.c" />
<ClCompile Include="lib\vtls\nss.c" />
<ClCompile Include="lib\vtls\openssl.c" />
<ClCompile Include="lib\vtls\polarssl.c" />
<ClCompile Include="lib\vtls\polarssl_threadlock.c" />
<ClCompile Include="lib\vtls\schannel.c" />
<ClCompile Include="lib\vtls\vtls.c" />
<ClCompile Include="lib\vauth\cleartext.c" />
<ClCompile Include="lib\vauth\cram.c" />
<ClCompile Include="lib\vauth\digest.c" />
<ClCompile Include="lib\vauth\digest_sspi.c" />
<ClCompile Include="lib\vauth\krb5_gssapi.c" />
<ClCompile Include="lib\vauth\krb5_sspi.c" />
<ClCompile Include="lib\vauth\ntlm.c" />
<ClCompile Include="lib\vauth\ntlm_sspi.c" />
<ClCompile Include="lib\vauth\oauth2.c" />
<ClCompile Include="lib\vauth\spnego_gssapi.c" />
<ClCompile Include="lib\vauth\spnego_sspi.c" />
<ClCompile Include="lib\vauth\vauth.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="lib\amigaos.h" />
<ClInclude Include="lib\arpa_telnet.h" />
<ClInclude Include="lib\asyn.h" />
<ClInclude Include="lib\config-amigaos.h" />
<ClInclude Include="lib\config-dos.h" />
<ClInclude Include="lib\config-mac.h" />
<ClInclude Include="lib\config-os400.h" />
<ClInclude Include="lib\config-riscos.h" />
<ClInclude Include="lib\config-symbian.h" />
<ClInclude Include="lib\config-tpf.h" />
<ClInclude Include="lib\config-vxworks.h" />
<ClInclude Include="lib\config-win32.h" />
<ClInclude Include="lib\config-win32ce.h" />
<ClInclude Include="lib\conncache.h" />
<ClInclude Include="lib\connect.h" />
<ClInclude Include="lib\content_encoding.h" />
<ClInclude Include="lib\cookie.h" />
<ClInclude Include="lib\curl_addrinfo.h" />
<ClInclude Include="lib\curl_base64.h" />
<ClInclude Include="lib\curl_config.h" />
<ClInclude Include="lib\curl_des.h" />
<ClInclude Include="lib\curl_endian.h" />
<ClInclude Include="lib\curl_fnmatch.h" />
<ClInclude Include="lib\curl_gethostname.h" />
<ClInclude Include="lib\curl_gssapi.h" />
<ClInclude Include="lib\curl_hmac.h" />
<ClInclude Include="lib\curl_ldap.h" />
<ClInclude Include="lib\curl_md4.h" />
<ClInclude Include="lib\curl_md5.h" />
<ClInclude Include="lib\curl_memory.h" />
<ClInclude Include="lib\curl_memrchr.h" />
<ClInclude Include="lib\curl_multibyte.h" />
<ClInclude Include="lib\curl_ntlm_core.h" />
<ClInclude Include="lib\curl_ntlm_wb.h" />
<ClInclude Include="lib\curl_printf.h" />
<ClInclude Include="lib\curl_rtmp.h" />
<ClInclude Include="lib\curl_sasl.h" />
<ClInclude Include="lib\curl_sec.h" />
<ClInclude Include="lib\curl_setup.h" />
<ClInclude Include="lib\curl_setup_once.h" />
<ClInclude Include="lib\curl_sspi.h" />
<ClInclude Include="lib\curl_threads.h" />
<ClInclude Include="lib\curlx.h" />
<ClInclude Include="lib\dict.h" />
<ClInclude Include="lib\dotdot.h" />
<ClInclude Include="lib\easyif.h" />
<ClInclude Include="lib\escape.h" />
<ClInclude Include="lib\file.h" />
<ClInclude Include="lib\fileinfo.h" />
<ClInclude Include="lib\formdata.h" />
<ClInclude Include="lib\ftp.h" />
<ClInclude Include="lib\ftplistparser.h" />
<ClInclude Include="lib\getinfo.h" />
<ClInclude Include="lib\gopher.h" />
<ClInclude Include="lib\hash.h" />
<ClInclude Include="lib\hostcheck.h" />
<ClInclude Include="lib\hostip.h" />
<ClInclude Include="lib\http.h" />
<ClInclude Include="lib\http_chunks.h" />
<ClInclude Include="lib\http_digest.h" />
<ClInclude Include="lib\http_negotiate.h" />
<ClInclude Include="lib\http_ntlm.h" />
<ClInclude Include="lib\http_proxy.h" />
<ClInclude Include="lib\http2.h" />
<ClInclude Include="lib\if2ip.h" />
<ClInclude Include="lib\imap.h" />
<ClInclude Include="lib\inet_ntop.h" />
<ClInclude Include="lib\inet_pton.h" />
<ClInclude Include="lib\llist.h" />
<ClInclude Include="lib\memdebug.h" />
<ClInclude Include="lib\multihandle.h" />
<ClInclude Include="lib\multiif.h" />
<ClInclude Include="lib\netrc.h" />
<ClInclude Include="lib\non-ascii.h" />
<ClInclude Include="lib\nonblock.h" />
<ClInclude Include="lib\parsedate.h" />
<ClInclude Include="lib\pingpong.h" />
<ClInclude Include="lib\pipeline.h" />
<ClInclude Include="lib\pop3.h" />
<ClInclude Include="lib\progress.h" />
<ClInclude Include="lib\rawstr.h" />
<ClInclude Include="lib\rtsp.h" />
<ClInclude Include="lib\select.h" />
<ClInclude Include="lib\sendf.h" />
<ClInclude Include="lib\setup-os400.h" />
<ClInclude Include="lib\setup-vms.h" />
<ClInclude Include="lib\share.h" />
<ClInclude Include="lib\sigpipe.h" />
<ClInclude Include="lib\slist.h" />
<ClInclude Include="lib\smb.h" />
<ClInclude Include="lib\smtp.h" />
<ClInclude Include="lib\sockaddr.h" />
<ClInclude Include="lib\socks.h" />
<ClInclude Include="lib\speedcheck.h" />
<ClInclude Include="lib\splay.h" />
<ClInclude Include="lib\ssh.h" />
<ClInclude Include="lib\strdup.h" />
<ClInclude Include="lib\strequal.h" />
<ClInclude Include="lib\strerror.h" />
<ClInclude Include="lib\strtok.h" />
<ClInclude Include="lib\strtoofft.h" />
<ClInclude Include="lib\system_win32.h" />
<ClInclude Include="lib\telnet.h" />
<ClInclude Include="lib\tftp.h" />
<ClInclude Include="lib\timeval.h" />
<ClInclude Include="lib\transfer.h" />
<ClInclude Include="lib\url.h" />
<ClInclude Include="lib\urldata.h" />
<ClInclude Include="lib\warnless.h" />
<ClInclude Include="lib\wildcard.h" />
<ClInclude Include="lib\x509asn1.h" />
<ClInclude Include="lib\vtls\axtls.h" />
<ClInclude Include="lib\vtls\cyassl.h" />
<ClInclude Include="lib\vtls\darwinssl.h" />
<ClInclude Include="lib\vtls\gskit.h" />
<ClInclude Include="lib\vtls\gtls.h" />
<ClInclude Include="lib\vtls\mbedtls.h" />
<ClInclude Include="lib\vtls\nssg.h" />
<ClInclude Include="lib\vtls\openssl.h" />
<ClInclude Include="lib\vtls\polarssl.h" />
<ClInclude Include="lib\vtls\polarssl_threadlock.h" />
<ClInclude Include="lib\vtls\schannel.h" />
<ClInclude Include="lib\vtls\vtls.h" />
<ClInclude Include="lib\vauth\digest.h" />
<ClInclude Include="lib\vauth\ntlm.h" />
<ClInclude Include="lib\vauth\vauth.h" />
<ClInclude Include="include\curl\curl.h" />
<ClInclude Include="include\curl\curlbuild.h" />
<ClInclude Include="include\curl\curlrules.h" />
<ClInclude Include="include\curl\curlver.h" />
<ClInclude Include="include\curl\easy.h" />
<ClInclude Include="include\curl\mprintf.h" />
<ClInclude Include="include\curl\multi.h" />
<ClInclude Include="include\curl\stdcheaders.h" />
<ClInclude Include="include\curl\typecheck-gcc.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="lib\libcurl.rc" />
</ItemGroup>
</Project>

2
Externals/enet/enet.vcxproj.filters vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{a5756b80-36f2-45f6-b1f1-b67082477376}</UniqueIdentifier>

6
Externals/glslang/glslang.vcxproj vendored
View file

@ -35,12 +35,6 @@
<Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="glslang\GenericCodeGen\CodeGen.cpp" />
<ClCompile Include="glslang\GenericCodeGen\Link.cpp" />

2
Externals/glslang/glslang.vcxproj.filters vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="glslang\GenericCodeGen\Link.cpp">
<Filter>glslang\GenericCodeGen</Filter>

2
Externals/libusb/msvc/libusb_static_2013.vcxproj vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>

55
Externals/wxWidgets3/build/msw/wx_base.vcxproj vendored
View file

@ -807,9 +807,13 @@
</ClCompile>
<ClCompile Include="..\..\src\common\fs_arc.cpp" />
<ClCompile Include="..\..\src\common\fs_filter.cpp" />
<ClCompile Include="..\..\src\common\fs_inet.cpp" />
<ClCompile Include="..\..\src\common\fs_inet.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\fs_mem.cpp" />
<ClCompile Include="..\..\src\common\ftp.cpp" />
<ClCompile Include="..\..\src\common\ftp.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\gaugecmn.cpp" />
<ClCompile Include="..\..\src\common\gbsizer.cpp" />
<ClCompile Include="..\..\src\common\gdicmn.cpp" />
@ -825,7 +829,9 @@
<ClCompile Include="..\..\src\common\headercolcmn.cpp" />
<ClCompile Include="..\..\src\common\headerctrlcmn.cpp" />
<ClCompile Include="..\..\src\common\helpbase.cpp" />
<ClCompile Include="..\..\src\common\http.cpp" />
<ClCompile Include="..\..\src\common\http.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\hyperlnkcmn.cpp" />
<ClCompile Include="..\..\src\common\iconbndl.cpp" />
<ClCompile Include="..\..\src\common\imagall.cpp" />
@ -907,7 +913,9 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\process.cpp" />
<ClCompile Include="..\..\src\common\protocol.cpp" />
<ClCompile Include="..\..\src\common\protocol.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\quantize.cpp" />
<ClCompile Include="..\..\src\common\radiobtncmn.cpp" />
<ClCompile Include="..\..\src\common\radiocmn.cpp" />
@ -918,10 +926,18 @@
<ClCompile Include="..\..\src\common\rendcmn.cpp" />
<ClCompile Include="..\..\src\common\rgncmn.cpp" />
<ClCompile Include="..\..\src\common\richtooltipcmn.cpp" />
<ClCompile Include="..\..\src\common\sckaddr.cpp" />
<ClCompile Include="..\..\src\common\sckfile.cpp" />
<ClCompile Include="..\..\src\common\sckipc.cpp" />
<ClCompile Include="..\..\src\common\sckstrm.cpp" />
<ClCompile Include="..\..\src\common\sckaddr.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\sckfile.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\sckipc.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\sckstrm.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\scrolbarcmn.cpp" />
<ClCompile Include="..\..\src\common\selectdispatcher.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
@ -929,7 +945,9 @@
<ClCompile Include="..\..\src\common\settcmn.cpp" />
<ClCompile Include="..\..\src\common\sizer.cpp" />
<ClCompile Include="..\..\src\common\slidercmn.cpp" />
<ClCompile Include="..\..\src\common\socket.cpp" />
<ClCompile Include="..\..\src\common\socket.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\socketiohandler.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
@ -975,7 +993,9 @@
<ClCompile Include="..\..\src\common\uiactioncmn.cpp" />
<ClCompile Include="..\..\src\common\unichar.cpp" />
<ClCompile Include="..\..\src\common\uri.cpp" />
<ClCompile Include="..\..\src\common\url.cpp" />
<ClCompile Include="..\..\src\common\url.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\common\ustring.cpp" />
<ClCompile Include="..\..\src\common\utilscmn.cpp" />
<ClCompile Include="..\..\src\common\valgen.cpp" />
@ -1166,7 +1186,9 @@
</ClCompile>
<ClCompile Include="..\..\src\msw\dcscreen.cpp" />
<ClCompile Include="..\..\src\msw\dde.cpp" />
<ClCompile Include="..\..\src\msw\debughlp.cpp" />
<ClCompile Include="..\..\src\msw\debughlp.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\dialog.cpp" />
<ClCompile Include="..\..\src\msw\dialup.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
@ -1288,7 +1310,9 @@
<ClCompile Include="..\..\src\msw\settings.cpp" />
<ClCompile Include="..\..\src\msw\slider.cpp" />
<ClCompile Include="..\..\src\msw\snglinst.cpp" />
<ClCompile Include="..\..\src\msw\sockmsw.cpp" />
<ClCompile Include="..\..\src\msw\sockmsw.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\msw\sound.cpp" />
<ClCompile Include="..\..\src\msw\spinbutt.cpp" />
<ClCompile Include="..\..\src\msw\spinctrl.cpp" />
@ -1371,16 +1395,13 @@
<ClCompile>
<PreprocessorDefinitions>__WXDEBUG__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Lib>
<AdditionalOptions>/ignore:4221</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="$(ExternalsDir)libpng\png\png.vcxproj">
<Project>{01573c36-ac6e-49f6-94ba-572517eb9740}</Project>
<Project>{4C9F135B-A85E-430C-BAD4-4C67EF5FC12C}</Project>
</ProjectReference>
<ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
<Project>{3e1339f5-9311-4122-9442-369702e8fcad}</Project>
<Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

2
Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Setup Headers">
<UniqueIdentifier>{ea19c29f-6825-47dc-b54d-ee464810b353}</UniqueIdentifier>

2
Externals/wxWidgets3/wx/wxmsw.h vendored
View file

@ -1663,6 +1663,8 @@
//
// Recommended setting: 1, set to 0 if your programs never crash
#define wxUSE_CRASHREPORT 0
#define wxUSE_DBGHELP 0
/* --- end MSW options --- */
#endif // _WX_SETUP_H_

2
Source/Core/AudioCommon/AudioCommon.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="SoundStreams">
<UniqueIdentifier>{25ec8f16-fc60-4a63-bc3e-ad0272fd5942}</UniqueIdentifier>

2
Source/Core/Common/Common.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Crypto">
<UniqueIdentifier>{0336df21-7c3f-48a9-b767-9cf11d8958a6}</UniqueIdentifier>

2
Source/Core/Core/Core.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="ActionReplay">
<UniqueIdentifier>{e0d231ab-7a66-45ce-a8e4-c0225308f763}</UniqueIdentifier>

2
Source/Core/DiscIO/DiscIO.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="DiscScrubber">
<UniqueIdentifier>{3873659a-9a30-4a58-af9e-8dad7d7eb627}</UniqueIdentifier>

16
Source/Core/DolphinQt2/DolphinQt2.vcxproj
View file

@ -48,20 +48,12 @@
<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>
<SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Windows</SubSystem>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/NODEFAULTLIB:libcmt</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/NODEFAULTLIB:libcmt</AdditionalOptions>
<!--TODO fix up ffmpeg garbage-->
<AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
</Link>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Settings;$(ProjectDir)\Config;$(ProjectDir)\Config\Mapping;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</AdditionalIncludeDirectories>
</ResourceCompile>
<ResourceCompile>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ExternalsDir)/gettext</AdditionalIncludeDirectories>
</ResourceCompile>
<Manifest>
<AdditionalManifestFiles>DolphinQt2.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
@ -237,7 +229,7 @@
<!--Copy Exe, Data directory and DLLs which should be located in the executable directory-->
<ItemGroup>
<DataSysFiles Include="$(DolphinRootDir)Data\**\Sys\**\*.*" />
<DataTxtFiles Include="$(DolphinRootDir)Data\*.txt" />
<DataTxtFiles Include="$(DolphinRootDir)Data\license.txt" />
<ExternalDlls Include="$(ExternalsDir)OpenAL\lib\*.dll" />
<BinaryFiles Include="$(TargetPath)" />
<AllInputFiles Include="@(DataSysFiles);@(DataTxtFiles);@(ExternalDlls);@(BinaryFiles)" />
@ -246,7 +238,7 @@
<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)')" Condition="'$(I_AM_BUILDACUS)'==''">
<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)" />
<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)" />

2
Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="Main.cpp" />
<ClCompile Include="MainWindow.cpp" />

2
Source/Core/DolphinQt2/DolphinQt2.vcxproj.user
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

7
Source/Core/DolphinWX/DolphinWX.vcxproj
View file

@ -40,15 +40,12 @@
<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>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
<!--TODO fix up ffmpeg garbage-->
<AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<ClCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Manifest>
<AdditionalManifestFiles>DolphinWX.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>

2
Source/Core/DolphinWX/DolphinWX.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="GUI">
<UniqueIdentifier>{0c0288ac-1168-4534-b3d3-051b9981f842}</UniqueIdentifier>

2
Source/Core/DolphinWX/DolphinWX.vcxproj.user
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!--For some stupid reason this has to be in the .user file...-->
<LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>

2
Source/Core/InputCommon/InputCommon.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="ControllerInterface">
<UniqueIdentifier>{3a755a86-0efa-4396-bf79-bb3a1910764d}</UniqueIdentifier>

10
Source/Core/UICommon/UICommon.vcxproj
View file

@ -35,16 +35,6 @@
<Import Project="..\..\VSProps\PCHUse.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>

2
Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="D3D">
<UniqueIdentifier>{ae700f7e-33c8-45b5-b7ee-a0ded3630549}</UniqueIdentifier>

2
Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Decoder">
<UniqueIdentifier>{f29f8e7f-21ba-49da-8044-e5279a091c8f}</UniqueIdentifier>

14
Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
View file

@ -35,20 +35,6 @@
<Import Project="..\..\..\VSProps\PCHUse.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Lib />
<Lib />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Lib />
<Lib />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="BoundingBox.cpp" />
<ClCompile Include="CommandBufferManager.cpp" />

20
Source/Core/VideoCommon/VideoCommon.vcxproj
View file

@ -35,26 +35,6 @@
<Import Project="..\..\VSProps\PCHUse.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="AsyncRequests.cpp" />
<ClCompile Include="AVIDump.cpp" />

2
Source/Core/VideoCommon/VideoCommon.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Base">
<UniqueIdentifier>{23908fac-d3fd-4fa5-a9b4-87b3bafc7bd9}</UniqueIdentifier>

2
Source/DSPTool/DSPTool.vcxproj.filters
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="TestData">
<UniqueIdentifier>{0b70242b-1d98-432f-a60e-d4ca0674852e}</UniqueIdentifier>

4
Source/PCH/pch.h
View file

@ -67,8 +67,8 @@
#ifdef _WIN32
#if _MSC_FULL_VER < 190023918
#error Please update your build environment to Visual Studio 2015 Update 2 or later!
#if _MSC_FULL_VER < 191025017
#error Please update your build environment to the latest Visual Studio 2017!
#endif
#include <Windows.h>

4
Source/UnitTests/UnitTests.vcxproj
View file

@ -48,8 +48,8 @@
<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>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
<!--TODO fix up ffmpeg garbage-->
<AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>

2
Source/UnitTests/UnitTests.vcxproj.user
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!--For some stupid reason this has to be in the .user file...-->
<!--This is only used to allow UnitTests to find OpenAL DLL...kinda hacky-->

25
Source/VSProps/Base.props
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<DolphinRelease Condition="'$(DolphinRelease)'!='true' or '$(Configuration)'!='Release'">false</DolphinRelease>
@ -35,10 +35,13 @@
<AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)cubeb\include;$(ExternalsDir)cubeb\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)curl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)enet\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)GL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)libusb\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)LZO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -46,8 +49,8 @@
<AdditionalIncludeDirectories>$(ExternalsDir)mbedtls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)SFML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)SOIL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3;$(ExternalsDir)wxWidgets3\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_FFMPEG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -85,14 +88,19 @@
<!--Enable Standard Conformance-->
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
<!--Enforce some behaviors as standards-conformant when they don't default as such-->
<AdditionalOptions>/Zc:inline /volatile:iso %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/Zc:inline /Zc:throwingNew /volatile:iso %(AdditionalOptions)</AdditionalOptions>
<!--Enable detailed debug info-->
<AdditionalOptions>/Zo /utf-8 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions>
<!--Treat sources as utf-8-->
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<DiagnosticsFormat>Caret</DiagnosticsFormat>
<!--
This is for GetVersionEx being marked as depreciated - which is idiotic and there's
not much else we can do since many externals use it. The bad part is that there doesn't
seem to be a way to only ignore the specific instance we don't care about...
4996 is for GetVersionEx being marked as depreciated - which is idiotic and there's
not much else we can do since many externals use it. The bad part is that there doesn't
seem to be a way to only ignore the specific instance we don't care about...
4351 squashes a warning telling us the compiler is behaving as expected (instead of old,
broken behavior).
-->
<DisableSpecificWarnings>4996;4351</DisableSpecificWarnings>
</ClCompile>
@ -109,7 +117,6 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>

2
Source/VSProps/ClDisableAllWarnings.props
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>

2
Source/VSProps/PCHCommon.props
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>

2
Source/VSProps/PCHCreate.props
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="PCHCommon.props" />
</ImportGroup>

2
Source/VSProps/PCHUse.props
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="PCHCommon.props" />
</ImportGroup>

3
Source/VSProps/QtCompile.props
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<QTDIRDefault>$(ExternalsDir)Qt\Qt5.8.0\5.8\msvc2015_64\</QTDIRDefault>
<QTDIR Condition="Exists('$(QTDIRDefault)') And ('$(QTDIR)'=='' Or !Exists('$(QTDIR)'))">$(QTDIRDefault)</QTDIR>
@ -138,7 +138,6 @@
</PropertyGroup>
<Target Name="QtCopyBinaries"
AfterTargets="Build"
Condition="'$(I_AM_BUILDACUS)'==''"
Inputs="@(QtDlls);@(QtPlugins)"
Outputs="@(QtDlls -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)');@(QtPlugins -> '$(BinaryOutputDir)$(QtPluginFolder)\%(RecursiveDir)%(Filename)%(Extension)')">
<Message Text="Copying Qt .dlls" Importance="High" />

2
Source/VSProps/QtCompile.targets
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CleanDependsOn>QtResourceClean;QtUiClean;QtMocClean;$(CleanDependsOn)</CleanDependsOn>
<!--

5
Source/VSProps/WXWOverrides.props
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
@ -7,9 +7,8 @@
<!--Created in the vcxproj-->
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
<ExceptionHandling>Async</ExceptionHandling>
<PreprocessorDefinitions>WXBUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\xxhash;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalOptions>"/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\" %(AdditionalOptions)</AdditionalOptions>

11
Source/dolphin-emu.sln
View file

@ -1,18 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26430.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcxproj", "{47411FDB-1BF2-48D0-AB4E-C7C41160F898}"
ProjectSection(ProjectDependencies) = postProject
{8EA11166-6512-44FC-B7A5-A4D1ECC81170} = {8EA11166-6512-44FC-B7A5-A4D1ECC81170}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{E54CF649-140E-4255-81A5-30A673C1FB36}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}"
ProjectSection(ProjectDependencies) = postProject
{8EA11166-6512-44FC-B7A5-A4D1ECC81170} = {8EA11166-6512-44FC-B7A5-A4D1ECC81170}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}"
EndProject