Browse Source

Remove support for Visual Studio 2013.

Underground78 3 years ago
parent
commit
8e892a430d

+ 0
- 2
.gitignore View File

@@ -14,7 +14,6 @@
14 14
 /.cov/*
15 15
 /.git-rewrite
16 16
 /bin
17
-/bin15
18 17
 /build.user.bat
19 18
 /contrib/[Aa][Ss]tyle.exe
20 19
 /contrib/cov-int
@@ -31,7 +30,6 @@
31 30
 /src/mpc-hc/mpcresources/tx.exe
32 31
 /src/mpc-hc/res/mpc-hc.exe.manifest
33 32
 /src/MPCTestAPI/bin
34
-/src/MPCTestAPI/bin15
35 33
 /src/thirdparty/DoctorDump/obj
36 34
 /src/thirdparty/LAVFilters/obj
37 35
 ipch

+ 5
- 20
build.bat View File

@@ -55,7 +55,6 @@ FOR %%G IN (%ARG%) DO (
55 55
   IF /I "%%G" == "Translations" SET "CONFIG=Translation" & SET /A ARGC+=1  & SET "NO_INST=True" & SET "NO_ZIP=True" & SET "NO_LITE=True"
56 56
   IF /I "%%G" == "Debug"        SET "BUILDCFG=Debug"     & SET /A ARGBC+=1 & SET "NO_INST=True"
57 57
   IF /I "%%G" == "Release"      SET "BUILDCFG=Release"   & SET /A ARGBC+=1
58
-  IF /I "%%G" == "VS2013"       SET "COMPILER=VS2013"    & SET /A ARGCOMP+=1
59 58
   IF /I "%%G" == "VS2015"       SET "COMPILER=VS2015"    & SET /A ARGCOMP+=1
60 59
   IF /I "%%G" == "Packages"     SET "PACKAGES=True"      & SET /A VALID+=1
61 60
   IF /I "%%G" == "Installer"    SET "INSTALLER=True"     & SET /A VALID+=1
@@ -92,15 +91,9 @@ IF /I "%ZIP%" == "True"         IF "%NO_ZIP%" == "True"  GOTO UnsupportedSwitch
92 91
 IF /I "%MPCHC_LITE%" == "True"  IF "%NO_LITE%" == "True" GOTO UnsupportedSwitch
93 92
 IF /I "%CLEAN%" == "LAVFilters" IF "%NO_LAV%" == "True"  GOTO UnsupportedSwitch
94 93
 
95
-IF /I "%COMPILER%" == "VS2015" (
96
-  IF NOT DEFINED VS140COMNTOOLS GOTO MissingVar
97
-  SET "TOOLSET=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
98
-  SET "BIN_DIR=bin15"
99
-) ELSE (
100
-  IF NOT DEFINED VS120COMNTOOLS GOTO MissingVar
101
-  SET "TOOLSET=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
102
-  SET "BIN_DIR=bin"
103
-)
94
+IF NOT DEFINED VS140COMNTOOLS GOTO MissingVar
95
+SET "TOOLSET=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
96
+SET "BIN_DIR=bin"
104 97
 
105 98
 IF EXIST "%FILE_DIR%signinfo.txt" (
106 99
   IF /I "%INSTALLER%" == "True" SET "SIGN=True"
@@ -352,10 +345,6 @@ IF DEFINED MPCHC_LITE (
352 345
 
353 346
 CALL :SubCopyDXDll %MPCHC_COPY_DX_DLL_ARGS%
354 347
 
355
-IF /I "%COMPILER%" == "VS2015" (
356
-  SET MPCHC_INNO_DEF=%MPCHC_INNO_DEF% /DVS2015
357
-)
358
-
359 348
 CALL "%COMMON%" :SubDetectInnoSetup
360 349
 
361 350
 IF NOT DEFINED InnoSetupPath (
@@ -409,10 +398,6 @@ IF /I "%BUILDCFG%" == "Debug" (
409 398
   SET "VS_OUT_DIR=%VS_OUT_DIR%_Debug"
410 399
 )
411 400
 
412
-IF /I "%COMPILER%" == "VS2015" (
413
-  SET "PCKG_NAME=%PCKG_NAME%.%COMPILER%"
414
-)
415
-
416 401
 IF EXIST "%PCKG_NAME%.7z"     DEL "%PCKG_NAME%.7z"
417 402
 IF EXIST "%PCKG_NAME%.pdb.7z" DEL "%PCKG_NAME%.pdb.7z"
418 403
 IF EXIST "%PCKG_NAME%"        RD /Q /S "%PCKG_NAME%"
@@ -492,14 +477,14 @@ EXIT /B
492 477
 TITLE %~nx0 Help
493 478
 ECHO.
494 479
 ECHO Usage:
495
-ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Main^|Resources^|MPCHC^|IconLib^|Translations^|Filters^|API^|All] [Debug^|Release] [Lite] [Packages^|Installer^|7z] [LAVFilters] [VS2013^|VS2015] [Analyze]
480
+ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Main^|Resources^|MPCHC^|IconLib^|Translations^|Filters^|API^|All] [Debug^|Release] [Lite] [Packages^|Installer^|7z] [LAVFilters] [VS2015] [Analyze]
496 481
 ECHO.
497 482
 ECHO Notes: You can also prefix the commands with "-", "--" or "/".
498 483
 ECHO        Debug only applies to mpc-hc.sln.
499 484
 ECHO        The arguments are not case sensitive and can be ommitted.
500 485
 ECHO. & ECHO.
501 486
 ECHO Executing %~nx0 without any arguments will use the default ones:
502
-ECHO "%~nx0 Build Both MPCHC Release VS2013"
487
+ECHO "%~nx0 Build Both MPCHC Release VS2015"
503 488
 ECHO. & ECHO.
504 489
 ECHO Examples:
505 490
 ECHO %~nx0 x86 Resources     -Builds the x86 resources

+ 1
- 10
distrib/mpc-hc_setup.iss View File

@@ -29,7 +29,6 @@
29 29
 #endif
30 30
 
31 31
 ; If you want to compile the 64-bit version define "x64build" (uncomment the define below or use build.bat)
32
-;#define VS2015
33 32
 ;#define x64Build
34 33
 ;#define MPCHC_LITE
35 34
 
@@ -61,11 +60,7 @@
61 60
 #define app_vername     = app_name + " " + app_ver
62 61
 #define quick_launch    "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
63 62
 
64
-#if defined(VS2015)
65
-  #define base_bindir   = "..\bin15"
66
-#else
67
-  #define base_bindir   = "..\bin"
68
-#endif
63
+#define base_bindir     = "..\bin"
69 64
 
70 65
 #ifdef x64Build
71 66
   #define bindir        = AddBackslash(base_bindir) + "mpc-hc_x64"
@@ -99,10 +94,6 @@
99 94
   #endif
100 95
 #endif
101 96
 
102
-#if defined(VS2015)
103
-  #define OutFilename    = OutFilename + ".VS2015"
104
-#endif
105
-
106 97
 #if MPC_NIGHTLY_RELEASE
107 98
   #define FullAppNameVer = app_vername + " " + "(" + str(MPCHC_HASH) + ")"
108 99
 #else

+ 0
- 5
docs/Compilation.txt View File

@@ -5,11 +5,6 @@ https://trac.mpc-hc.org/wiki/How_to_compile_the_MPC
5 5
 
6 6
 Part A: Preparing the Visual Studio environment
7 7
 
8
- Visual Studio 2013 (WARNING: this compiler is now deprecated and support for it will be removed soon)
9
-  1. Install Visual C++ 2013, part of Visual Studio 2013 Professional (Express won't work, other editions work fine)
10
-  2. Make sure you install all available updates from Microsoft Update
11
-  3. Install the DirectX SDK (June 2010) -> http://go.microsoft.com/fwlink/?LinkID=71193
12
-
13 8
  Visual Studio 2015
14 9
   1. Install Visual C++ 2015, part of Visual Studio 2015 (any edition will work fine)
15 10
   2. Make sure you install all available updates from Microsoft Update

+ 0
- 1
src/MPCTestAPI/MPCTestAPI.vcxproj View File

@@ -41,7 +41,6 @@
41 41
   <PropertyGroup Label="UserMacros" />
42 42
   <PropertyGroup>
43 43
     <OutDir>$(SolutionDir)bin\$(Configuration)_$(Platform)\</OutDir>
44
-    <OutDir Condition="'$(PlatformToolsetVersion)'=='140'">$(SolutionDir)bin15\$(Configuration)_$(Platform)\</OutDir>
45 44
   </PropertyGroup>
46 45
   <ItemDefinitionGroup>
47 46
     <ClCompile>

+ 0
- 4
src/MPCTestAPI/MPCTestAPIDlg.cpp View File

@@ -164,11 +164,7 @@ BOOL CRegisterCopyDataDlg::OnInitDialog()
164 164
 
165 165
     // TODO: Add extra initialization here
166 166
 
167
-#if (_MSC_VER == 1900)
168
-    m_strMPCPath = _T("..\\..\\..\\..\\bin15\\");
169
-#else
170 167
     m_strMPCPath = _T("..\\..\\..\\..\\bin\\");
171
-#endif
172 168
 #if defined(_WIN64)
173 169
     m_strMPCPath += _T("mpc-hc_x64");
174 170
 #else

+ 3
- 13
src/common.props View File

@@ -10,14 +10,6 @@
10 10
     <LinkIncremental Condition="$(Configuration.Contains('Debug'))">true</LinkIncremental>
11 11
     <LinkIncremental Condition="$(Configuration.Contains('Release'))">false</LinkIncremental>
12 12
   </PropertyGroup>
13
-  <PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
14
-    <IntDir>$(SolutionDir)bin15\obj\$(Configuration)_$(PlatformName)\$(ProjectName)\</IntDir>
15
-    <OutDir>$(SolutionDir)bin15\lib\$(Configuration)_$(PlatformName)\</OutDir>
16
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">$(SolutionDir)bin15\Filters_x86_Debug\</OutDir>
17
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">$(SolutionDir)bin15\Filters_x64_Debug\</OutDir>
18
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Filter|Win32'">$(SolutionDir)bin15\Filters_x86\</OutDir>
19
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Filter|x64'">$(SolutionDir)bin15\Filters_x64\</OutDir>
20
-  </PropertyGroup>
21 13
   <ItemDefinitionGroup>
22 14
     <ClCompile>
23 15
       <AdditionalOptions>/w34701 /w34706 /Zo /Zc:rvalueCast %(AdditionalOptions)</AdditionalOptions>
@@ -43,8 +35,7 @@
43 35
     </Lib>
44 36
     <Link>
45 37
       <DataExecutionPrevention>true</DataExecutionPrevention>
46
-      <GenerateDebugInformation>true</GenerateDebugInformation>
47
-      <GenerateDebugInformation Condition="'$(PlatformToolsetVersion)'=='140'">Debug</GenerateDebugInformation>
38
+      <GenerateDebugInformation>Debug</GenerateDebugInformation>
48 39
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
49 40
       <SubSystem>Windows</SubSystem>
50 41
       <TargetMachine Condition="'$(Platform)'=='Win32'">MachineX86</TargetMachine>
@@ -70,7 +61,7 @@
70 61
     </ResourceCompile>
71 62
     <Link>
72 63
       <ImageHasSafeExceptionHandlers Condition="'$(Platform)'=='Win32'">false</ImageHasSafeExceptionHandlers>
73
-      <GenerateDebugInformation Condition="'$(PlatformToolsetVersion)'=='140'">DebugFastLink</GenerateDebugInformation>
64
+      <GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
74 65
     </Link>
75 66
   </ItemDefinitionGroup>
76 67
   <ItemDefinitionGroup Condition="$(Configuration.Contains('Release'))">
@@ -94,8 +85,7 @@
94 85
     <Link>
95 86
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
96 87
       <LargeAddressAware Condition="'$(Platform)'=='Win32'">true</LargeAddressAware>
97
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
98
-      <LinkTimeCodeGeneration Condition="'$(PlatformToolsetVersion)'=='140'">UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
88
+      <LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
99 89
       <MergeSections>.rdata=.text</MergeSections>
100 90
       <OptimizeReferences>true</OptimizeReferences>
101 91
       <SetChecksum>true</SetChecksum>

+ 1
- 10
src/filters/transform/VSFilter/installer/vsfilter_setup.iss View File

@@ -26,7 +26,6 @@
26 26
 
27 27
 ; If you want to compile the 64-bit version define "x64Build" (uncomment the define below or use build.bat)
28 28
 #define sse_required
29
-;#define VS2015
30 29
 ;#define x64Build
31 30
 
32 31
 
@@ -44,11 +43,7 @@
44 43
 #define app_vername     = app_name + " " + app_version
45 44
 #define quick_launch    "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
46 45
 
47
-#if defined(VS2015)
48
-  #define base_bindir   = AddBackslash(top_dir) + "bin15"
49
-#else
50
-  #define base_bindir   = AddBackslash(top_dir) + "bin"
51
-#endif
46
+#define base_bindir     = AddBackslash(top_dir) + "bin"
52 47
 
53 48
 #ifdef x64Build
54 49
   #define bindir        = AddBackslash(base_bindir) + "Filters_x64"
@@ -68,10 +63,6 @@
68 63
   #define FullAppNameVer = app_vername
69 64
 #endif
70 65
 
71
-#if defined(VS2015)
72
-  #define FullAppNameVer = FullAppNameVer + " VS2015"
73
-#endif
74
-
75 66
 #if MPC_NIGHTLY_RELEASE
76 67
   #define FullAppNameVer = FullAppNameVer + " " + str(MPC_VERSION_NIGHTLY)
77 68
 #endif

+ 1
- 15
src/mpc-hc/AboutDlg.cpp View File

@@ -102,21 +102,7 @@ BOOL CAboutDlg::OnInitDialog()
102 102
 #else
103 103
     m_MPCCompiler = _T("MSVC 2015");
104 104
 #endif
105
-#elif (_MSC_VER == 1800)              // 2013
106
-#if (_MSC_FULL_VER == 180040629)
107
-    m_MPCCompiler = _T("MSVC 2013 Update 5");
108
-#elif (_MSC_FULL_VER == 180031101)
109
-    m_MPCCompiler = _T("MSVC 2013 Update 4");
110
-#elif (_MSC_FULL_VER == 180030723)
111
-    m_MPCCompiler = _T("MSVC 2013 Update 3");
112
-#elif (_MSC_FULL_VER == 180030501)
113
-    m_MPCCompiler = _T("MSVC 2013 Update 2");
114
-#elif (_MSC_FULL_VER < 180021005)
115
-    m_MPCCompiler = _T("MSVC 2013 Preview/Beta/RC");
116
-#else
117
-    m_MPCCompiler = _T("MSVC 2013");
118
-#endif
119
-#elif (_MSC_VER <= 1700)
105
+#elif (_MSC_VER <= 1800)
120 106
 #error Compiler is not supported!
121 107
 #endif
122 108
 #else

+ 0
- 6
src/mpc-hc/CrashReporterDialog/CrashReporterDialog.vcxproj View File

@@ -44,12 +44,6 @@
44 44
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\mpc-hc_x64\CrashReporter\</OutDir>
45 45
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin\mpc-hc_x64 Lite\CrashReporter\</OutDir>
46 46
   </PropertyGroup>
47
-  <PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
48
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin15\mpc-hc_x86\CrashReporter\</OutDir>
49
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|Win32'">$(SolutionDir)bin15\mpc-hc_x86 Lite\CrashReporter\</OutDir>
50
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin15\mpc-hc_x64\CrashReporter\</OutDir>
51
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin15\mpc-hc_x64 Lite\CrashReporter\</OutDir>
52
-  </PropertyGroup>
53 47
   <ItemDefinitionGroup>
54 48
     <ClCompile>
55 49
       <PrecompiledHeader>NotUsing</PrecompiledHeader>

+ 2
- 14
src/mpc-hc/mpc-hc.vcxproj View File

@@ -66,16 +66,6 @@
66 66
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin\mpc-hc_x64 Lite\</OutDir>
67 67
     <TargetName Condition="'$(Platform)'=='x64'">$(ProjectName)64</TargetName>
68 68
   </PropertyGroup>
69
-  <PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
70
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin15\mpc-hc_x86_$(Configuration)\</OutDir>
71
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lite|Win32'">$(SolutionDir)bin15\mpc-hc_x86_$(Configuration)\</OutDir>
72
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin15\mpc-hc_x64_$(Configuration)\</OutDir>
73
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lite|x64'">$(SolutionDir)bin15\mpc-hc_x64_$(Configuration)\</OutDir>
74
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin15\mpc-hc_x86\</OutDir>
75
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|Win32'">$(SolutionDir)bin15\mpc-hc_x86 Lite\</OutDir>
76
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin15\mpc-hc_x64\</OutDir>
77
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin15\mpc-hc_x64 Lite\</OutDir>
78
-  </PropertyGroup>
79 69
   <ItemDefinitionGroup>
80 70
     <ResourceCompile>
81 71
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -107,14 +97,12 @@
107 97
   </ItemDefinitionGroup>
108 98
   <ItemDefinitionGroup Condition="$(Configuration.Contains('Release'))">
109 99
     <Link>
110
-      <AdditionalLibraryDirectories Condition="'$(PlatformToolsetVersion)'!='140'">$(SolutionDir)bin\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
111
-      <AdditionalLibraryDirectories Condition="'$(PlatformToolsetVersion)'=='140'">$(SolutionDir)bin15\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100
+      <AdditionalLibraryDirectories>$(SolutionDir)bin\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
112 101
     </Link>
113 102
   </ItemDefinitionGroup>
114 103
   <ItemDefinitionGroup Condition="$(Configuration.Contains('Debug'))">
115 104
     <Link>
116
-      <AdditionalLibraryDirectories Condition="'$(PlatformToolsetVersion)'!='140'">$(SolutionDir)bin\lib\Debug_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
117
-      <AdditionalLibraryDirectories Condition="'$(PlatformToolsetVersion)'=='140'">$(SolutionDir)bin15\lib\Debug_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
105
+      <AdditionalLibraryDirectories>$(SolutionDir)bin\lib\Debug_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
118 106
     </Link>
119 107
   </ItemDefinitionGroup>
120 108
   <ItemDefinitionGroup Condition="$(Configuration.Contains('Debug')) and '$(Platform)'=='Win32'">

+ 1
- 5
src/mpc-hc/mpciconlib/mpciconlib.vcxproj View File

@@ -34,10 +34,6 @@
34 34
     <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)bin\mpc-hc_x86\</OutDir>
35 35
     <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)bin\mpc-hc_x64\</OutDir>
36 36
   </PropertyGroup>
37
-  <PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
38
-    <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)bin15\mpc-hc_x86\</OutDir>
39
-    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)bin15\mpc-hc_x64\</OutDir>
40
-  </PropertyGroup>
41 37
   <ItemDefinitionGroup>
42 38
     <ClCompile>
43 39
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -45,7 +41,7 @@
45 41
     <Link>
46 42
       <NoEntryPoint>true</NoEntryPoint>
47 43
       <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
48
-      <AdditionalDependencies Condition="'$(PlatformToolsetVersion)'=='140'">libcmt.lib;libvcruntime.lib;libucrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
44
+      <AdditionalDependencies>libcmt.lib;libvcruntime.lib;libucrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
49 45
     </Link>
50 46
     <ResourceCompile>
51 47
       <AdditionalIncludeDirectories>..\..\..\include</AdditionalIncludeDirectories>

+ 0
- 5
src/mpc-hc/mpcresources/mpcresources.vcxproj View File

@@ -405,11 +405,6 @@
405 405
     <TargetName Condition="'$(Configuration)'=='Release Ukrainian'">$(ProjectName).uk</TargetName>
406 406
     <TargetName Condition="'$(Configuration)'=='Release Vietnamese'">$(ProjectName).vi</TargetName>
407 407
   </PropertyGroup>
408
-  <PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
409
-    <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)bin15\mpc-hc_x86\Lang\</OutDir>
410
-    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)bin15\mpc-hc_x64\Lang\</OutDir>
411
-    <IntDir>$(SolutionDir)bin15\obj\Release_$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
412
-  </PropertyGroup>
413 408
   <ItemDefinitionGroup>
414 409
     <Lib>
415 410
       <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>

+ 1
- 5
src/platform.props View File

@@ -1,10 +1,6 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
-  <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '12.0'">
4
-    <PlatformToolset Condition="'$(ANALYZE)'!='true'">v120_xp</PlatformToolset>
5
-    <PlatformToolset Condition="'$(ANALYZE)'=='true'">v120</PlatformToolset>
6
-  </PropertyGroup>
7
-  <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '14.0'">
3
+  <PropertyGroup Label="Configuration">
8 4
     <PlatformToolset Condition="'$(ANALYZE)'!='true'">v140_xp</PlatformToolset>
9 5
     <PlatformToolset Condition="'$(ANALYZE)'=='true'">v140</PlatformToolset>
10 6
   </PropertyGroup>

+ 0
- 6
src/thirdparty/DoctorDump/DoctorDump.vcxproj View File

@@ -44,12 +44,6 @@
44 44
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\mpc-hc_x64\</OutDir>
45 45
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin\mpc-hc_x64 Lite\</OutDir>
46 46
   </PropertyGroup>
47
-  <PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
48
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin15\mpc-hc_x86\</OutDir>
49
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|Win32'">$(SolutionDir)bin15\mpc-hc_x86 Lite\</OutDir>
50
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin15\mpc-hc_x64\</OutDir>
51
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin15\mpc-hc_x64 Lite\</OutDir>
52
-  </PropertyGroup>
53 47
   <PropertyGroup>
54 48
     <BaseIntermediateOutputPath>$(IntDir)</BaseIntermediateOutputPath>
55 49
     <NMakeBuildCommandLine>$(ProjectDir)deploy.bat $(Platform) "$(OutDir)"</NMakeBuildCommandLine>

+ 0
- 5
src/thirdparty/LAVFilters/LAVFilters.vcxproj View File

@@ -43,11 +43,6 @@
43 43
     <NMakeReBuildCommandLine>build_lavfilters.bat Rebuild $(Platform) $(Configuration) Silent Nocolors</NMakeReBuildCommandLine>
44 44
     <NMakeCleanCommandLine>build_lavfilters.bat Clean $(Platform) $(Configuration) Silent Nocolors</NMakeCleanCommandLine>
45 45
   </PropertyGroup>
46
-  <PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
47
-    <NMakeBuildCommandLine>build_lavfilters.bat Build $(Platform) $(Configuration) VS2015 Silent Nocolors</NMakeBuildCommandLine>
48
-    <NMakeReBuildCommandLine>build_lavfilters.bat Rebuild $(Platform) $(Configuration) VS2015 Silent Nocolors</NMakeReBuildCommandLine>
49
-    <NMakeCleanCommandLine>build_lavfilters.bat Clean $(Platform) $(Configuration) VS2015 Silent Nocolors</NMakeCleanCommandLine>
50
-  </PropertyGroup>
51 46
   <ItemDefinitionGroup>
52 47
   </ItemDefinitionGroup>
53 48
   <ItemGroup>

+ 1
- 5
src/thirdparty/LAVFilters/build_ffmpeg.sh View File

@@ -3,11 +3,7 @@
3 3
 echo "$(pwd)" | grep -q '[[:blank:]]' &&
4 4
   echo "Out of tree builds are impossible with whitespace in source path." && exit 1
5 5
 
6
-if [ "${4}" == "VS2015" ]; then
7
-  bin_folder=bin15
8
-else
9
-  bin_folder=bin
10
-fi
6
+bin_folder=bin
11 7
 
12 8
 if [ "${1}" == "x64" ]; then
13 9
   arch=x86_64

+ 5
- 12
src/thirdparty/LAVFilters/build_lavfilters.bat View File

@@ -52,7 +52,6 @@ FOR %%G IN (%ARG%) DO (
52 52
   IF /I "%%G" == "x64"      SET "ARCH=x64"            & SET /A ARGPL+=1
53 53
   IF /I "%%G" == "Debug"    SET "RELEASETYPE=Debug"   & SET /A ARGBC+=1
54 54
   IF /I "%%G" == "Release"  SET "RELEASETYPE=Release" & SET /A ARGBC+=1
55
-  IF /I "%%G" == "VS2013"   SET "COMPILER=VS2013"     & SET /A ARGCOMP+=1
56 55
   IF /I "%%G" == "VS2015"   SET "COMPILER=VS2015"     & SET /A ARGCOMP+=1
57 56
   IF /I "%%G" == "Silent"   SET "SILENT=True"         & SET /A VALID+=1
58 57
   IF /I "%%G" == "Nocolors" SET "NOCOLORS=True"       & SET /A VALID+=1
@@ -68,15 +67,9 @@ IF %ARGPL%   GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGPL% == 0   (SET "ARCH=Bo
68 67
 IF %ARGBC%   GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGBC% == 0   (SET "RELEASETYPE=Release")
69 68
 IF %ARGCOMP% GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGCOMP% == 0 (SET "COMPILER=VS2015")
70 69
 
71
-IF /I "%COMPILER%" == "VS2015" (
72
-  IF NOT DEFINED VS140COMNTOOLS GOTO MissingVar
73
-  SET "TOOLSET=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
74
-  SET "BIN_DIR=%ROOT_DIR%\bin15"
75
-) ELSE (
76
-  IF NOT DEFINED VS120COMNTOOLS GOTO MissingVar
77
-  SET "TOOLSET=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
78
-  SET "BIN_DIR=%ROOT_DIR%\bin"
79
-)
70
+IF NOT DEFINED VS140COMNTOOLS GOTO MissingVar
71
+SET "TOOLSET=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
72
+SET "BIN_DIR=%ROOT_DIR%\bin"
80 73
 
81 74
 IF /I "%ARCH%" == "Both" (
82 75
   SET "ARCH=x86" & CALL :Main
@@ -210,13 +203,13 @@ CALL "%COMMON%" :SubMsg "ERROR" "LAV Filters compilation failed!" & EXIT /B 1
210 203
 TITLE %~nx0 Help
211 204
 ECHO.
212 205
 ECHO Usage:
213
-ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Debug^|Release] [VS2013^|VS2015]
206
+ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Debug^|Release] [VS2015]
214 207
 ECHO.
215 208
 ECHO Notes: You can also prefix the commands with "-", "--" or "/".
216 209
 ECHO        The arguments are not case sensitive and can be ommitted.
217 210
 ECHO. & ECHO.
218 211
 ECHO Executing %~nx0 without any arguments will use the default ones:
219
-ECHO "%~nx0 Build Both Release VS2013"
212
+ECHO "%~nx0 Build Both Release VS2015"
220 213
 ECHO.
221 214
 POPD
222 215
 ENDLOCAL

+ 0
- 4
src/thirdparty/sanear/sanear.props View File

@@ -6,8 +6,4 @@
6 6
       <AdditionalIncludeDirectories>$(SolutionDir)src\thirdparty\BaseClasses;$(SolutionDir)src\thirdparty\soxr\libsoxr\src;$(SolutionDir)src\thirdparty\bs2b\libbs2b\src;$(SolutionDir)src\thirdparty\SoundTouch\soundtouch\include;$(SolutionDir)src\thirdparty\zita-resampler\zita-resampler\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7 7
     </ClCompile>
8 8
   </ItemDefinitionGroup>
9
-  <PropertyGroup Condition="'$(DefaultPlatformToolset)'=='v140'">
10
-    <IntDir>$(SolutionDir)bin15\obj\$(Configuration)_$(PlatformName)\$(ProjectName)\</IntDir>
11
-    <OutDir>$(SolutionDir)bin15\lib\$(Configuration)_$(PlatformName)\</OutDir>
12
-  </PropertyGroup>
13 9
 </Project>

Loading…
Cancel
Save