Browse Source

Remove support for Visual Studio 2013.

tags/1.7.11^2
Underground78 4 years ago
parent
commit
8e892a430d

+ 0
- 2
.gitignore View File

@@ -14,7 +14,6 @@
/.cov/*
/.git-rewrite
/bin
/bin15
/build.user.bat
/contrib/[Aa][Ss]tyle.exe
/contrib/cov-int
@@ -31,7 +30,6 @@
/src/mpc-hc/mpcresources/tx.exe
/src/mpc-hc/res/mpc-hc.exe.manifest
/src/MPCTestAPI/bin
/src/MPCTestAPI/bin15
/src/thirdparty/DoctorDump/obj
/src/thirdparty/LAVFilters/obj
ipch

+ 5
- 20
build.bat View File

@@ -55,7 +55,6 @@ FOR %%G IN (%ARG%) DO (
IF /I "%%G" == "Translations" SET "CONFIG=Translation" & SET /A ARGC+=1 & SET "NO_INST=True" & SET "NO_ZIP=True" & SET "NO_LITE=True"
IF /I "%%G" == "Debug" SET "BUILDCFG=Debug" & SET /A ARGBC+=1 & SET "NO_INST=True"
IF /I "%%G" == "Release" SET "BUILDCFG=Release" & SET /A ARGBC+=1
IF /I "%%G" == "VS2013" SET "COMPILER=VS2013" & SET /A ARGCOMP+=1
IF /I "%%G" == "VS2015" SET "COMPILER=VS2015" & SET /A ARGCOMP+=1
IF /I "%%G" == "Packages" SET "PACKAGES=True" & SET /A VALID+=1
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
IF /I "%MPCHC_LITE%" == "True" IF "%NO_LITE%" == "True" GOTO UnsupportedSwitch
IF /I "%CLEAN%" == "LAVFilters" IF "%NO_LAV%" == "True" GOTO UnsupportedSwitch
IF /I "%COMPILER%" == "VS2015" (
IF NOT DEFINED VS140COMNTOOLS GOTO MissingVar
SET "TOOLSET=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
SET "BIN_DIR=bin15"
) ELSE (
IF NOT DEFINED VS120COMNTOOLS GOTO MissingVar
SET "TOOLSET=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
SET "BIN_DIR=bin"
)
IF NOT DEFINED VS140COMNTOOLS GOTO MissingVar
SET "TOOLSET=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
SET "BIN_DIR=bin"
IF EXIST "%FILE_DIR%signinfo.txt" (
IF /I "%INSTALLER%" == "True" SET "SIGN=True"
@@ -352,10 +345,6 @@ IF DEFINED MPCHC_LITE (
CALL :SubCopyDXDll %MPCHC_COPY_DX_DLL_ARGS%
IF /I "%COMPILER%" == "VS2015" (
SET MPCHC_INNO_DEF=%MPCHC_INNO_DEF% /DVS2015
)
CALL "%COMMON%" :SubDetectInnoSetup
IF NOT DEFINED InnoSetupPath (
@@ -409,10 +398,6 @@ IF /I "%BUILDCFG%" == "Debug" (
SET "VS_OUT_DIR=%VS_OUT_DIR%_Debug"
)
IF /I "%COMPILER%" == "VS2015" (
SET "PCKG_NAME=%PCKG_NAME%.%COMPILER%"
)
IF EXIST "%PCKG_NAME%.7z" DEL "%PCKG_NAME%.7z"
IF EXIST "%PCKG_NAME%.pdb.7z" DEL "%PCKG_NAME%.pdb.7z"
IF EXIST "%PCKG_NAME%" RD /Q /S "%PCKG_NAME%"
@@ -492,14 +477,14 @@ EXIT /B
TITLE %~nx0 Help
ECHO.
ECHO Usage:
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]
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]
ECHO.
ECHO Notes: You can also prefix the commands with "-", "--" or "/".
ECHO Debug only applies to mpc-hc.sln.
ECHO The arguments are not case sensitive and can be ommitted.
ECHO. & ECHO.
ECHO Executing %~nx0 without any arguments will use the default ones:
ECHO "%~nx0 Build Both MPCHC Release VS2013"
ECHO "%~nx0 Build Both MPCHC Release VS2015"
ECHO. & ECHO.
ECHO Examples:
ECHO %~nx0 x86 Resources -Builds the x86 resources

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

@@ -29,7 +29,6 @@
#endif
; If you want to compile the 64-bit version define "x64build" (uncomment the define below or use build.bat)
;#define VS2015
;#define x64Build
;#define MPCHC_LITE
@@ -61,11 +60,7 @@
#define app_vername = app_name + " " + app_ver
#define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
#if defined(VS2015)
#define base_bindir = "..\bin15"
#else
#define base_bindir = "..\bin"
#endif
#define base_bindir = "..\bin"
#ifdef x64Build
#define bindir = AddBackslash(base_bindir) + "mpc-hc_x64"
@@ -99,10 +94,6 @@
#endif
#endif
#if defined(VS2015)
#define OutFilename = OutFilename + ".VS2015"
#endif
#if MPC_NIGHTLY_RELEASE
#define FullAppNameVer = app_vername + " " + "(" + str(MPCHC_HASH) + ")"
#else

+ 0
- 5
docs/Compilation.txt View File

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

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

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

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

@@ -164,11 +164,7 @@ BOOL CRegisterCopyDataDlg::OnInitDialog()
// TODO: Add extra initialization here
#if (_MSC_VER == 1900)
m_strMPCPath = _T("..\\..\\..\\..\\bin15\\");
#else
m_strMPCPath = _T("..\\..\\..\\..\\bin\\");
#endif
#if defined(_WIN64)
m_strMPCPath += _T("mpc-hc_x64");
#else

+ 3
- 13
src/common.props View File

@@ -10,14 +10,6 @@
<LinkIncremental Condition="$(Configuration.Contains('Debug'))">true</LinkIncremental>
<LinkIncremental Condition="$(Configuration.Contains('Release'))">false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
<IntDir>$(SolutionDir)bin15\obj\$(Configuration)_$(PlatformName)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)bin15\lib\$(Configuration)_$(PlatformName)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Filter|Win32'">$(SolutionDir)bin15\Filters_x86_Debug\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Filter|x64'">$(SolutionDir)bin15\Filters_x64_Debug\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Filter|Win32'">$(SolutionDir)bin15\Filters_x86\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Filter|x64'">$(SolutionDir)bin15\Filters_x64\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions>/w34701 /w34706 /Zo /Zc:rvalueCast %(AdditionalOptions)</AdditionalOptions>
@@ -43,8 +35,7 @@
</Lib>
<Link>
<DataExecutionPrevention>true</DataExecutionPrevention>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation Condition="'$(PlatformToolsetVersion)'=='140'">Debug</GenerateDebugInformation>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
<SubSystem>Windows</SubSystem>
<TargetMachine Condition="'$(Platform)'=='Win32'">MachineX86</TargetMachine>
@@ -70,7 +61,7 @@
</ResourceCompile>
<Link>
<ImageHasSafeExceptionHandlers Condition="'$(Platform)'=='Win32'">false</ImageHasSafeExceptionHandlers>
<GenerateDebugInformation Condition="'$(PlatformToolsetVersion)'=='140'">DebugFastLink</GenerateDebugInformation>
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="$(Configuration.Contains('Release'))">
@@ -94,8 +85,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LargeAddressAware Condition="'$(Platform)'=='Win32'">true</LargeAddressAware>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<LinkTimeCodeGeneration Condition="'$(PlatformToolsetVersion)'=='140'">UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>
<SetChecksum>true</SetChecksum>

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

@@ -26,7 +26,6 @@
; If you want to compile the 64-bit version define "x64Build" (uncomment the define below or use build.bat)
#define sse_required
;#define VS2015
;#define x64Build
@@ -44,11 +43,7 @@
#define app_vername = app_name + " " + app_version
#define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
#if defined(VS2015)
#define base_bindir = AddBackslash(top_dir) + "bin15"
#else
#define base_bindir = AddBackslash(top_dir) + "bin"
#endif
#define base_bindir = AddBackslash(top_dir) + "bin"
#ifdef x64Build
#define bindir = AddBackslash(base_bindir) + "Filters_x64"
@@ -68,10 +63,6 @@
#define FullAppNameVer = app_vername
#endif
#if defined(VS2015)
#define FullAppNameVer = FullAppNameVer + " VS2015"
#endif
#if MPC_NIGHTLY_RELEASE
#define FullAppNameVer = FullAppNameVer + " " + str(MPC_VERSION_NIGHTLY)
#endif

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

@@ -102,21 +102,7 @@ BOOL CAboutDlg::OnInitDialog()
#else
m_MPCCompiler = _T("MSVC 2015");
#endif
#elif (_MSC_VER == 1800) // 2013
#if (_MSC_FULL_VER == 180040629)
m_MPCCompiler = _T("MSVC 2013 Update 5");
#elif (_MSC_FULL_VER == 180031101)
m_MPCCompiler = _T("MSVC 2013 Update 4");
#elif (_MSC_FULL_VER == 180030723)
m_MPCCompiler = _T("MSVC 2013 Update 3");
#elif (_MSC_FULL_VER == 180030501)
m_MPCCompiler = _T("MSVC 2013 Update 2");
#elif (_MSC_FULL_VER < 180021005)
m_MPCCompiler = _T("MSVC 2013 Preview/Beta/RC");
#else
m_MPCCompiler = _T("MSVC 2013");
#endif
#elif (_MSC_VER <= 1700)
#elif (_MSC_VER <= 1800)
#error Compiler is not supported!
#endif
#else

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

@@ -44,12 +44,6 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\mpc-hc_x64\CrashReporter\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin\mpc-hc_x64 Lite\CrashReporter\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin15\mpc-hc_x86\CrashReporter\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|Win32'">$(SolutionDir)bin15\mpc-hc_x86 Lite\CrashReporter\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin15\mpc-hc_x64\CrashReporter\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin15\mpc-hc_x64 Lite\CrashReporter\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>

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

@@ -66,16 +66,6 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin\mpc-hc_x64 Lite\</OutDir>
<TargetName Condition="'$(Platform)'=='x64'">$(ProjectName)64</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin15\mpc-hc_x86_$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lite|Win32'">$(SolutionDir)bin15\mpc-hc_x86_$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin15\mpc-hc_x64_$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Lite|x64'">$(SolutionDir)bin15\mpc-hc_x64_$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin15\mpc-hc_x86\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|Win32'">$(SolutionDir)bin15\mpc-hc_x86 Lite\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin15\mpc-hc_x64\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin15\mpc-hc_x64 Lite\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -107,14 +97,12 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="$(Configuration.Contains('Release'))">
<Link>
<AdditionalLibraryDirectories Condition="'$(PlatformToolsetVersion)'!='140'">$(SolutionDir)bin\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="'$(PlatformToolsetVersion)'=='140'">$(SolutionDir)bin15\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)bin\lib\Release_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="$(Configuration.Contains('Debug'))">
<Link>
<AdditionalLibraryDirectories Condition="'$(PlatformToolsetVersion)'!='140'">$(SolutionDir)bin\lib\Debug_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="'$(PlatformToolsetVersion)'=='140'">$(SolutionDir)bin15\lib\Debug_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)bin\lib\Debug_$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="$(Configuration.Contains('Debug')) and '$(Platform)'=='Win32'">

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

@@ -34,10 +34,6 @@
<OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)bin\mpc-hc_x86\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)bin\mpc-hc_x64\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
<OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)bin15\mpc-hc_x86\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)bin15\mpc-hc_x64\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -45,7 +41,7 @@
<Link>
<NoEntryPoint>true</NoEntryPoint>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalDependencies Condition="'$(PlatformToolsetVersion)'=='140'">libcmt.lib;libvcruntime.lib;libucrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libcmt.lib;libvcruntime.lib;libucrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\include</AdditionalIncludeDirectories>

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

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

+ 1
- 5
src/platform.props View File

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

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

@@ -44,12 +44,6 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\mpc-hc_x64\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin\mpc-hc_x64 Lite\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin15\mpc-hc_x86\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|Win32'">$(SolutionDir)bin15\mpc-hc_x86 Lite\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin15\mpc-hc_x64\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release Lite|x64'">$(SolutionDir)bin15\mpc-hc_x64 Lite\</OutDir>
</PropertyGroup>
<PropertyGroup>
<BaseIntermediateOutputPath>$(IntDir)</BaseIntermediateOutputPath>
<NMakeBuildCommandLine>$(ProjectDir)deploy.bat $(Platform) "$(OutDir)"</NMakeBuildCommandLine>

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

@@ -43,11 +43,6 @@
<NMakeReBuildCommandLine>build_lavfilters.bat Rebuild $(Platform) $(Configuration) Silent Nocolors</NMakeReBuildCommandLine>
<NMakeCleanCommandLine>build_lavfilters.bat Clean $(Platform) $(Configuration) Silent Nocolors</NMakeCleanCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(PlatformToolsetVersion)'=='140'">
<NMakeBuildCommandLine>build_lavfilters.bat Build $(Platform) $(Configuration) VS2015 Silent Nocolors</NMakeBuildCommandLine>
<NMakeReBuildCommandLine>build_lavfilters.bat Rebuild $(Platform) $(Configuration) VS2015 Silent Nocolors</NMakeReBuildCommandLine>
<NMakeCleanCommandLine>build_lavfilters.bat Clean $(Platform) $(Configuration) VS2015 Silent Nocolors</NMakeCleanCommandLine>
</PropertyGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
<ItemGroup>

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

@@ -3,11 +3,7 @@
echo "$(pwd)" | grep -q '[[:blank:]]' &&
echo "Out of tree builds are impossible with whitespace in source path." && exit 1

if [ "${4}" == "VS2015" ]; then
bin_folder=bin15
else
bin_folder=bin
fi
bin_folder=bin

if [ "${1}" == "x64" ]; then
arch=x86_64

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

@@ -52,7 +52,6 @@ FOR %%G IN (%ARG%) DO (
IF /I "%%G" == "x64" SET "ARCH=x64" & SET /A ARGPL+=1
IF /I "%%G" == "Debug" SET "RELEASETYPE=Debug" & SET /A ARGBC+=1
IF /I "%%G" == "Release" SET "RELEASETYPE=Release" & SET /A ARGBC+=1
IF /I "%%G" == "VS2013" SET "COMPILER=VS2013" & SET /A ARGCOMP+=1
IF /I "%%G" == "VS2015" SET "COMPILER=VS2015" & SET /A ARGCOMP+=1
IF /I "%%G" == "Silent" SET "SILENT=True" & SET /A VALID+=1
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
IF %ARGBC% GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGBC% == 0 (SET "RELEASETYPE=Release")
IF %ARGCOMP% GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGCOMP% == 0 (SET "COMPILER=VS2015")
IF /I "%COMPILER%" == "VS2015" (
IF NOT DEFINED VS140COMNTOOLS GOTO MissingVar
SET "TOOLSET=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
SET "BIN_DIR=%ROOT_DIR%\bin15"
) ELSE (
IF NOT DEFINED VS120COMNTOOLS GOTO MissingVar
SET "TOOLSET=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
SET "BIN_DIR=%ROOT_DIR%\bin"
)
IF NOT DEFINED VS140COMNTOOLS GOTO MissingVar
SET "TOOLSET=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
SET "BIN_DIR=%ROOT_DIR%\bin"
IF /I "%ARCH%" == "Both" (
SET "ARCH=x86" & CALL :Main
@@ -210,13 +203,13 @@ CALL "%COMMON%" :SubMsg "ERROR" "LAV Filters compilation failed!" & EXIT /B 1
TITLE %~nx0 Help
ECHO.
ECHO Usage:
ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Debug^|Release] [VS2013^|VS2015]
ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Debug^|Release] [VS2015]
ECHO.
ECHO Notes: You can also prefix the commands with "-", "--" or "/".
ECHO The arguments are not case sensitive and can be ommitted.
ECHO. & ECHO.
ECHO Executing %~nx0 without any arguments will use the default ones:
ECHO "%~nx0 Build Both Release VS2013"
ECHO "%~nx0 Build Both Release VS2015"
ECHO.
POPD
ENDLOCAL

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

@@ -6,8 +6,4 @@
<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>
</ClCompile>
</ItemDefinitionGroup>
<PropertyGroup Condition="'$(DefaultPlatformToolset)'=='v140'">
<IntDir>$(SolutionDir)bin15\obj\$(Configuration)_$(PlatformName)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)bin15\lib\$(Configuration)_$(PlatformName)\</OutDir>
</PropertyGroup>
</Project>

Loading…
Cancel
Save