From b116e05abe22941b41e760591d8e760206b8e027 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 2 Jun 2017 01:12:07 -0700 Subject: [windows] Do not copy cpack_package_description.txt to output dir --- Source/Core/DolphinQt2/DolphinQt2.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core') diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 888b126218..f7d1655254 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -237,7 +237,7 @@ - + -- cgit v1.2.3 From ddae5058e9531185614e4525d99d6bf2eb7ff46c Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 2 Jun 2017 01:33:50 -0700 Subject: msbuild: increment other version numbers to vs2017 equivalents --- Source/Core/DolphinWX/DolphinWX.vcxproj.user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core') diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.user b/Source/Core/DolphinWX/DolphinWX.vcxproj.user index aa15c4df30..85a227e9d2 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj.user +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj.user @@ -1,5 +1,5 @@  - + $(BinaryOutputDir)$(TargetFileName) -- cgit v1.2.3 From c251311b02e8729bcb393e938d32acbd40f5caf3 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 2 Jun 2017 01:52:51 -0700 Subject: DolphinQt: remove I_AM_BUILDACUS as the buildbot doesn't use it anymore --- Source/Core/DolphinQt2/DolphinQt2.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core') diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index f7d1655254..895009546f 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -246,7 +246,7 @@ - + -- cgit v1.2.3 From 397720a9fe4cc4f89a214c71c31866cece228f1c Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 2 Jun 2017 02:54:31 -0700 Subject: might as well update yet some more pointless version numbers.. --- Source/Core/AudioCommon/AudioCommon.vcxproj.filters | 2 +- Source/Core/Common/Common.vcxproj.filters | 2 +- Source/Core/Core/Core.vcxproj.filters | 2 +- Source/Core/DiscIO/DiscIO.vcxproj.filters | 2 +- Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters | 2 +- Source/Core/DolphinQt2/DolphinQt2.vcxproj.user | 2 +- Source/Core/DolphinWX/DolphinWX.vcxproj.filters | 2 +- Source/Core/InputCommon/InputCommon.vcxproj.filters | 2 +- Source/Core/VideoBackends/D3D/D3D.vcxproj.filters | 2 +- Source/Core/VideoBackends/OGL/OGL.vcxproj.filters | 2 +- Source/Core/VideoCommon/VideoCommon.vcxproj.filters | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'Source/Core') diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters index 7c3fe389ee..35ba0a6c7d 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters @@ -1,5 +1,5 @@ - + {25ec8f16-fc60-4a63-bc3e-ad0272fd5942} diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters index 267fde6d83..107355431a 100644 --- a/Source/Core/Common/Common.vcxproj.filters +++ b/Source/Core/Common/Common.vcxproj.filters @@ -1,5 +1,5 @@  - + {0336df21-7c3f-48a9-b767-9cf11d8958a6} diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index 8dee1673d1..5f10c6fbd5 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -1,5 +1,5 @@  - + {e0d231ab-7a66-45ce-a8e4-c0225308f763} diff --git a/Source/Core/DiscIO/DiscIO.vcxproj.filters b/Source/Core/DiscIO/DiscIO.vcxproj.filters index b56078e599..38f1b7c2d8 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj.filters +++ b/Source/Core/DiscIO/DiscIO.vcxproj.filters @@ -1,5 +1,5 @@  - + {3873659a-9a30-4a58-af9e-8dad7d7eb627} diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters index 5e25b8b58f..e3d6e53cec 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters @@ -1,5 +1,5 @@  - + diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user index 42da7cddad..81453971f2 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user @@ -1,5 +1,5 @@  - + $(BinaryOutputDir)$(TargetFileName) WindowsLocalDebugger diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters index a230a9db4d..10bb09664f 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters @@ -1,5 +1,5 @@ - + {0c0288ac-1168-4534-b3d3-051b9981f842} diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters index 3b1c4025e0..600a77727d 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj.filters +++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters @@ -1,5 +1,5 @@  - + {3a755a86-0efa-4396-bf79-bb3a1910764d} diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters index 67e78c6c29..04eb8fb19f 100644 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters +++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters @@ -1,5 +1,5 @@  - + {ae700f7e-33c8-45b5-b7ee-a0ded3630549} diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters index 201a4045f8..aac1b1fe9e 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters @@ -1,5 +1,5 @@  - + {f29f8e7f-21ba-49da-8044-e5279a091c8f} diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index ec0150a272..eb45d40ffc 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -1,5 +1,5 @@  - + {23908fac-d3fd-4fa5-a9b4-87b3bafc7bd9} -- cgit v1.2.3 From a3caa14ade2862fcc76d8b3037229c564cf73242 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 2 Jun 2017 04:08:37 -0700 Subject: remove duplicate code in msbuild files --- Source/Core/UICommon/UICommon.vcxproj | 7 +------ Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj | 11 +---------- Source/Core/VideoCommon/VideoCommon.vcxproj | 17 +---------------- 3 files changed, 3 insertions(+), 32 deletions(-) (limited to 'Source/Core') diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index 6e0403fd0e..210dafc17d 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -35,12 +35,7 @@ - - - $(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) - - - + $(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj index eed7820c19..d75aa38a9d 100644 --- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj +++ b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj @@ -35,19 +35,10 @@ - + $(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories) - - - - - - $(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories) - - - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index 994ef23223..e2802ae02c 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -35,25 +35,10 @@ - + $(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories) - - %(AdditionalDependencies) - - - - - - - $(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories) - - - %(AdditionalDependencies) - - - -- cgit v1.2.3 From a6c102ba5ce9acb34a5e59cf1686794244e7494f Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 2 Jun 2017 16:57:18 -0700 Subject: msbuild: remove extra zlib include from UICommon --- Source/Core/UICommon/UICommon.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core') diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index 210dafc17d..f0c141f623 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -37,7 +37,7 @@ - $(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) + $(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) -- cgit v1.2.3 From 7431dd3dcec740f2305a082f8c12601d1530d075 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 2 Jun 2017 17:20:58 -0700 Subject: msbuild: make Externals inclusion methods uniform --- Source/Core/DolphinWX/DolphinWX.vcxproj | 3 --- Source/Core/UICommon/UICommon.vcxproj | 5 ----- Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj | 5 ----- Source/Core/VideoCommon/VideoCommon.vcxproj | 5 ----- 4 files changed, 18 deletions(-) (limited to 'Source/Core') diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index d3545feb19..c472c2d3e1 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -46,9 +46,6 @@ $(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories) - - $(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) - DolphinWX.manifest;%(AdditionalManifestFiles) diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index f0c141f623..8b65ab9c25 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -35,11 +35,6 @@ - - - $(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) - - diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj index d75aa38a9d..531d2da843 100644 --- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj +++ b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj @@ -35,11 +35,6 @@ - - - $(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories) - - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index e2802ae02c..88d3e4b759 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -35,11 +35,6 @@ - - - $(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories) - - -- cgit v1.2.3 From 09367c8c1064ac0f311b65c64ed278d7b46f466f Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 2 Jun 2017 17:24:59 -0700 Subject: msbuild: remove more duplicate code --- Source/Core/DolphinQt2/DolphinQt2.vcxproj | 5 ++--- Source/Core/DolphinWX/DolphinWX.vcxproj | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'Source/Core') diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 895009546f..5ecfb1cb0a 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -48,9 +48,8 @@ $(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories) 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) - Windows - /NODEFAULTLIB:libcmt - /NODEFAULTLIB:libcmt + + /NODEFAULTLIB:libcmt %(AdditionalOptions) $(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Settings;$(ProjectDir)\Config;$(ProjectDir)\Config\Mapping;%(AdditionalIncludeDirectories) diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index c472c2d3e1..60b43820a8 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -40,8 +40,8 @@ $(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories) 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) - /NODEFAULTLIB:libcmt %(AdditionalOptions) - /NODEFAULTLIB:libcmt %(AdditionalOptions) + + /NODEFAULTLIB:libcmt %(AdditionalOptions) $(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories) -- cgit v1.2.3 From 43dbb635d5963115ead0d91f7f36a8dfc6079c56 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 2 Jun 2017 17:49:55 -0700 Subject: msbuild: remove more meaningless stuff --- Source/Core/DolphinQt2/DolphinQt2.vcxproj | 7 ------- 1 file changed, 7 deletions(-) (limited to 'Source/Core') diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 5ecfb1cb0a..113637506c 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -54,13 +54,6 @@ $(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Settings;$(ProjectDir)\Config;$(ProjectDir)\Config\Mapping;%(AdditionalIncludeDirectories) - - - - - - $(ExternalsDir)/gettext - DolphinQt2.manifest;%(AdditionalManifestFiles) -- cgit v1.2.3