Remove VS2010 support.

Also remove the MFC hacks we used for VS2010 to reduce the executable's size.

1 files changed, 24 insertions, 38 deletions

diff --git a/build.bat b/build.bat
index 0ed4b9fa4..6fd6b0000 100644
--- a/build.bat
+++ b/build.bat
@@ -41,7 +41,6 @@ SET ARGB=0
 SET ARGBC=0

 SET ARGC=0

 SET ARGCL=0

-SET ARGCOMP=0

 SET ARGD=0

 SET ARGF=0

 SET ARGLAVF=0

@@ -78,8 +77,6 @@ FOR %%G IN (%ARG%) DO (
   IF /I "%%G" == "Translations" SET "CONFIG=Translation" & SET /A ARGC+=1  & SET /A ARGD+=1 & SET /A ARGM+=1

   IF /I "%%G" == "Debug"        SET "BUILDCFG=Debug"     & SET /A ARGBC+=1 & SET /A ARGD+=1

   IF /I "%%G" == "Release"      SET "BUILDCFG=Release"   & SET /A ARGBC+=1

-  IF /I "%%G" == "VS2010"       SET "COMPILER=VS2010"    & SET /A ARGCOMP+=1

-  IF /I "%%G" == "VS2012"       SET "COMPILER=VS2012"    & SET /A ARGCOMP+=1 & SET /A ARGANL-=1

   IF /I "%%G" == "Packages"     SET "PACKAGES=True"      & SET /A VALID+=1 & SET /A ARGCL+=1 & SET /A ARGD+=1 & SET /A ARGF+=1 & SET /A ARGM+=1

   IF /I "%%G" == "Installer"    SET "INSTALLER=True"     & SET /A VALID+=1 & SET /A ARGCL+=1 & SET /A ARGD+=1 & SET /A ARGF+=1 & SET /A ARGM+=1

   IF /I "%%G" == "7z"           SET "ZIP=True"           & SET /A VALID+=1 & SET /A ARGCL+=1 & SET /A ARGM+=1

@@ -91,7 +88,7 @@ FOR %%G IN (%ARG%) DO (
 )

 

 FOR %%G IN (%*) DO SET /A INPUT+=1

-SET /A VALID+=%ARGB%+%ARGPL%+%ARGC%+%ARGBC%+%ARGCOMP%

+SET /A VALID+=%ARGB%+%ARGPL%+%ARGC%+%ARGBC%

 

 IF %VALID% NEQ %INPUT% GOTO UnsupportedSwitch

 

@@ -99,7 +96,6 @@ IF %ARGB%    GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGB% == 0    (SET "BUILDTY
 IF %ARGPL%   GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGPL% == 0   (SET "PPLATFORM=Both")

 IF %ARGC%    GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGC% == 0    (SET "CONFIG=MPCHC")

 IF %ARGBC%   GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGBC% == 0   (SET "BUILDCFG=Release")

-IF %ARGCOMP% GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGCOMP% == 0 (SET "COMPILER=VS2012")

 IF %ARGCL%   GTR 1 (GOTO UnsupportedSwitch)

 IF %ARGD%    GTR 1 (GOTO UnsupportedSwitch)

 IF %ARGF%    GTR 1 (GOTO UnsupportedSwitch)

@@ -111,16 +107,9 @@ IF %ARGANL%  GTR 1 (GOTO UnsupportedSwitch)
 

 IF /I "%PACKAGES%" == "True" SET "INSTALLER=True" & SET "ZIP=True"

 

-IF /I "%COMPILER%" == "VS2012" (

-  IF NOT DEFINED VS110COMNTOOLS GOTO MissingVar

-  SET "TOOLSET=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"

-  SET "BIN_DIR=bin12"

-  SET "SLN_SUFFIX=_vs2012"

-) ELSE (

-  IF NOT DEFINED VS100COMNTOOLS GOTO MissingVar

-  SET "TOOLSET=%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"

-  SET "BIN_DIR=bin"

-)

+IF NOT DEFINED VS110COMNTOOLS GOTO MissingVar

+SET "TOOLSET=%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"

+SET "BIN_DIR=bin"

 

 IF EXIST "%~dp0signinfo.txt" (

   IF /I "%INSTALLER%" == "True" SET "SIGN=True"

@@ -160,7 +149,7 @@ IF /I "%PPLATFORM%" == "x64" (
   SET "LAVFILTERSDIR=LAVFilters"

 )

 

-IF /I "%Rebuild%" == "LAVFilters" CALL "src\thirdparty\LAVFilters\build_lavfilters.bat" Rebuild %PPLATFORM% %BUILDCFG% %COMPILER%

+IF /I "%Rebuild%" == "LAVFilters" CALL "src\thirdparty\LAVFilters\build_lavfilters.bat" Rebuild %PPLATFORM% %BUILDCFG%

 IF %ERRORLEVEL% NEQ 0 ENDLOCAL & EXIT /B

 

 REM Always use x86_amd64 compiler, even on 64bit windows, because this is what VS is doing

@@ -198,7 +187,7 @@ EXIT /B
 

 :End

 IF %ERRORLEVEL% NEQ 0 EXIT /B

-TITLE Compiling MPC-HC %COMPILER% [FINISHED]

+TITLE Compiling MPC-HC [FINISHED]

 SET END_TIME=%TIME%

 CALL :SubGetDuration

 CALL :SubMsg "INFO" "Compilation started on %START_DATE%-%START_TIME% and completed on %DATE%-%END_TIME% [%DURATION%]"

@@ -209,19 +198,19 @@ EXIT /B
 :SubFilters

 IF %ERRORLEVEL% NEQ 0 EXIT /B

 

-TITLE Compiling MPC-HC Filters %COMPILER% - %BUILDCFG% Filter^|%1...

+TITLE Compiling MPC-HC Filters - %BUILDCFG% Filter^|%1...

 REM Call update_version.bat before building the filters

 CALL "update_version.bat"

 

-MSBuild.exe mpc-hc%SLN_SUFFIX%.sln %MSBUILD_SWITCHES%^

+MSBuild.exe mpc-hc.sln %MSBUILD_SWITCHES%^

  /target:%BUILDTYPE% /property:Configuration="%BUILDCFG% Filter";Platform=%1^

  /flp1:LogFile=%LOG_DIR%\filters_errors_%BUILDCFG%_%1.log;errorsonly;Verbosity=diagnostic^

  /flp2:LogFile=%LOG_DIR%\filters_warnings_%BUILDCFG%_%1.log;warningsonly;Verbosity=diagnostic

 IF %ERRORLEVEL% NEQ 0 (

-  CALL :SubMsg "ERROR" "mpc-hc%SLN_SUFFIX%.sln %BUILDCFG% Filter %1 - Compilation failed!"

+  CALL :SubMsg "ERROR" "mpc-hc.sln %BUILDCFG% Filter %1 - Compilation failed!"

   EXIT /B

 ) ELSE (

-  CALL :SubMsg "INFO" "mpc-hc%SLN_SUFFIX%.sln %BUILDCFG% Filter %1 compiled successfully"

+  CALL :SubMsg "INFO" "mpc-hc.sln %BUILDCFG% Filter %1 compiled successfully"

 )

 IF /I "%SIGN%" == "True" CALL :SubSign Filters *.ax

 IF /I "%SIGN%" == "True" CALL :SubSign Filters VSFilter.dll

@@ -231,16 +220,16 @@ EXIT /B
 :SubMPCHC

 IF %ERRORLEVEL% NEQ 0 EXIT /B

 

-TITLE Compiling MPC-HC %COMPILER% - %BUILDCFG%^|%1...

-MSBuild.exe mpc-hc%SLN_SUFFIX%.sln %MSBUILD_SWITCHES%^

+TITLE Compiling MPC-HC - %BUILDCFG%^|%1...

+MSBuild.exe mpc-hc.sln %MSBUILD_SWITCHES%^

  /target:%BUILDTYPE% /property:Configuration="%BUILDCFG%";Platform=%1^

  /flp1:LogFile="%LOG_DIR%\mpc-hc_errors_%BUILDCFG%_%1.log";errorsonly;Verbosity=diagnostic^

  /flp2:LogFile="%LOG_DIR%\mpc-hc_warnings_%BUILDCFG%_%1.log";warningsonly;Verbosity=diagnostic

 IF %ERRORLEVEL% NEQ 0 (

-  CALL :SubMsg "ERROR" "mpc-hc%SLN_SUFFIX%.sln %BUILDCFG% %1 - Compilation failed!"

+  CALL :SubMsg "ERROR" "mpc-hc.sln %BUILDCFG% %1 - Compilation failed!"

   EXIT /B

 ) ELSE (

-  CALL :SubMsg "INFO" "mpc-hc%SLN_SUFFIX%.sln %BUILDCFG% %1 compiled successfully"

+  CALL :SubMsg "INFO" "mpc-hc.sln %BUILDCFG% %1 compiled successfully"

 )

 IF /I "%SIGN%" == "True" CALL :SubSign MPC-HC mpc-hc*.exe

 IF /I "%SIGN%" == "True" CALL :SubSign MPC-HC *.dll %LAVFILTERSDIR%

@@ -270,14 +259,14 @@ EXIT /B
 :SubMPCIconLib

 IF %ERRORLEVEL% NEQ 0 EXIT /B

 

-TITLE Compiling mpciconlib %COMPILER% - Release^|%1...

-MSBuild.exe mpciconlib%SLN_SUFFIX%.sln %MSBUILD_SWITCHES%^

+TITLE Compiling mpciconlib - Release^|%1...

+MSBuild.exe mpciconlib.sln %MSBUILD_SWITCHES%^

  /target:%BUILDTYPE% /property:Configuration=Release;Platform=%1

 IF %ERRORLEVEL% NEQ 0 (

-  CALL :SubMsg "ERROR" "mpciconlib%SLN_SUFFIX%.sln %1 - Compilation failed!"

+  CALL :SubMsg "ERROR" "mpciconlib.sln %1 - Compilation failed!"

   EXIT /B

 ) ELSE (

-  CALL :SubMsg "INFO" "mpciconlib%SLN_SUFFIX%.sln %1 compiled successfully"

+  CALL :SubMsg "INFO" "mpciconlib.sln %1 compiled successfully"

 )

 IF /I "%SIGN%" == "True" CALL :SubSign MPC-HC mpciconlib.dll

 EXIT /B

@@ -291,8 +280,8 @@ FOR %%G IN ("Armenian" "Basque" "Belarusian" "Catalan" "Chinese Simplified"
  "Hungarian" "Italian" "Japanese" "Korean" "Polish" "Portuguese (Brazil)"

  "Romanian" "Russian" "Slovak" "Spanish" "Swedish" "Turkish" "Ukrainian"

 ) DO (

- TITLE Compiling mpcresources %COMPILER% - %%~G^|%1...

- MSBuild.exe mpcresources%SLN_SUFFIX%.sln %MSBUILD_SWITCHES%^

+ TITLE Compiling mpcresources - %%~G^|%1...

+ MSBuild.exe mpcresources.sln %MSBUILD_SWITCHES%^

  /target:%BUILDTYPE% /property:Configuration="Release %%~G";Platform=%1

  IF %ERRORLEVEL% NEQ 0 CALL :SubMsg "ERROR" "Compilation failed!" & EXIT /B

 )

@@ -337,8 +326,6 @@ IF /I "%~1" == "x64" (
   CALL :SubCopyDXDll x64

 ) ELSE CALL :SubCopyDXDll x86

 

-IF /I "%COMPILER%" == "VS2010" (SET MPCHC_INNO_DEF=%MPCHC_INNO_DEF% /DVS2010)

-

 CALL :SubDetectInnoSetup

 

 IF NOT DEFINED InnoSetupPath (

@@ -346,7 +333,7 @@ IF NOT DEFINED InnoSetupPath (
   EXIT /B

 )

 

-TITLE Compiling %1 %COMPILER% installer...

+TITLE Compiling %1 installer...

 "%InnoSetupPath%" /SMySignTool="cmd /c "%~dp0contrib\sign.bat" $f" /Q /O"%BIN_DIR%"^

  "distrib\mpc-hc_setup.iss" %MPCHC_INNO_DEF%

 IF %ERRORLEVEL% NEQ 0 CALL :SubMsg "ERROR" "Compilation failed!" & EXIT /B

@@ -384,7 +371,6 @@ IF /I "%BUILDCFG%" == "Debug" (
   SET "PCKG_NAME=%PCKG_NAME%.dbg"

   SET "VS_OUT_DIR=%VS_OUT_DIR%_Debug"

 )

-IF /I "%COMPILER%" == "VS2010" (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"

@@ -533,14 +519,14 @@ EXIT /B
 TITLE %~nx0 Help

 ECHO.

 ECHO Usage:

-ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Main^|Resources^|MPCHC^|IconLib^|Translations^|Filters^|All] [Debug^|Release] [Lite] [Packages^|Installer^|7z] [LAVFilters] [VS2010^|VS2012] [Analyze]

+ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Main^|Resources^|MPCHC^|IconLib^|Translations^|Filters^|All] [Debug^|Release] [Lite] [Packages^|Installer^|7z] [LAVFilters] [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 VS2012"

+ECHO "%~nx0 Build Both MPCHC Release"

 ECHO. & ECHO.

 ECHO Examples:

 ECHO %~nx0 x86 Resources     -Builds the x86 resources

@@ -558,7 +544,7 @@ EXIT /B
 

 :MissingVar

 COLOR 0C

-TITLE Compiling MPC-HC %COMPILER% [ERROR]

+TITLE Compiling MPC-HC [ERROR]

 ECHO Not all build dependencies were found.

 ECHO.

 ECHO See "docs\Compilation.txt" for more information.