DISTS: Merge MSVC versions into one folder

12 files changed, 10 insertions, 566 deletions

diff --git a/dists/msvc15/create_msvc15.bat b/dists/msvc/create_msvc.bat
index 283fd43f56..73305eac85 100644
--- a/dists/msvc15/create_msvc15.bat
+++ b/dists/msvc/create_msvc.bat
@@ -1,7 +1,7 @@
 @echo off
 
 echo.
-echo Automatic creation of the MSVC15 project files
+echo Automatic creation of the MSVC project files
 echo.
 
 if "%~1"=="/stable" goto stable
@@ -55,28 +55,28 @@ goto done
 echo.
 echo Creating project files with all engines enabled (stable and unstable)
 echo.
-create_project ..\.. --enable-all-engines --disable-fluidsynth --msvc --msvc-version 15 --build-events
+create_project ..\.. --enable-all-engines --disable-fluidsynth --msvc --build-events
 goto done
 
 :stable
 echo.
 echo Creating normal project files, with only the stable engines enabled
 echo.
-create_project ..\.. --disable-fluidsynth --msvc --msvc-version 15
+create_project ..\.. --disable-fluidsynth --msvc
 goto done
 
 :tools
 echo.
 echo Creating tools project files
 echo.
-create_project ..\.. --tools --msvc --msvc-version 15
+create_project ..\.. --tools --msvc
 goto done
 
 :tests
 echo.
 echo Creating tests project files
 echo.
-create_project ..\.. --tests --msvc --msvc-version 15
+create_project ..\.. --tests --msvc
 goto done
 
 :clean_check
@@ -92,6 +92,8 @@ goto clean_check
 :clean
 echo.
 echo Removing all project files
+del /Q *.vcproj* > NUL 2>&1
+del /Q *.vsprops > NUL 2>&1
 del /Q *.vcxproj* > NUL 2>&1
 del /Q *.props > NUL 2>&1
 del /Q *.sln* > NUL 2>&1
diff --git a/dists/msvc12/readme.txt b/dists/msvc/readme.txt
index 2d91c72140..e0da7f14c0 100644
--- a/dists/msvc12/readme.txt
+++ b/dists/msvc/readme.txt
@@ -2,8 +2,8 @@ The Visual Studio project files can now be created automatically from the GCC
 files using the create_project tool inside the /devtools/create_project folder.
 
 To create the default project files, build create_project.exe, copy it inside
-this folder and run the create_msvc12.bat file for a default build. You can run
+this folder and run the create_msvc.bat file for a default build. You can run
 create_project.exe with no parameters to check the possible command-line options.
 
-To enable debug visualization for common types, see the comment in
-/devtools/create_project/scripts/scummvm.natvis.
+To enable debug visualization for common types in Visual Studio 2012 and 2013,
+run /devtools/create_project/scripts/install_natvis.bat.
\ No newline at end of file
diff --git a/dists/msvc10/create_msvc10.bat b/dists/msvc10/create_msvc10.bat
deleted file mode 100644
index 81f5d156a9..0000000000
--- a/dists/msvc10/create_msvc10.bat
+++ /dev/null
@@ -1,105 +0,0 @@
-@echo off
-
-echo.
-echo Automatic creation of the MSVC10 project files
-echo.
-
-if "%~1"=="/stable" goto stable
-if "%~1"=="/STABLE" goto stable
-if "%~1"=="/all"    goto all
-if "%~1"=="/ALL"    goto all
-if "%~1"=="/tools"  goto tools
-if "%~1"=="/TOOLS"  goto tools
-if "%~1"=="/tests"  goto tests
-if "%~1"=="/TESTS"  goto tests
-if "%~1"=="/clean"  goto clean_check
-if "%~1"=="/CLEAN"  goto clean_check
-if "%~1"=="/help"   goto command_help
-if "%~1"=="/HELP"   goto command_help
-if "%~1"=="/?"      goto command_help
-
-if "%~1"==""        goto check_tool
-
-echo Invalid command parameter: %~1
-echo.
-
-:command_help
-echo Valid command parameters are:
-echo   stable   Generated stable engines project files
-echo   all      Generate all engines project files
-echo   tools    Generate project files for the devtools
-echo   clean    Clean generated project files
-echo   help     Show help message
-goto done
-
-:check_tool
-if not exist create_project.exe goto no_tool
-
-:question
-echo.
-set batchanswer=S
-set /p batchanswer="Enable stable engines only, or all engines? (S/a)"
-if "%batchanswer%"=="s" goto stable
-if "%batchanswer%"=="S" goto stable
-if "%batchanswer%"=="a" goto all
-if "%batchanswer%"=="A" goto all
-goto question
-
-:no_tool
-echo create_project.exe not found in the current folder.
-echo You need to build it first and copy it in this
-echo folder
-goto done
-
-:all
-echo.
-echo Creating project files with all engines enabled (stable and unstable)
-echo.
-create_project ..\.. --enable-all-engines --disable-fluidsynth --disable-sdlnet --disable-libcurl --disable-updates --msvc --msvc-version 10 --build-events
-goto done
-
-:stable
-echo.
-echo Creating normal project files, with only the stable engines enabled
-echo.
-create_project ..\.. --disable-fluidsynth --disable-sdlnet --disable-libcurl --disable-updates --msvc --msvc-version 10
-goto done
-
-:tools
-echo.
-echo Creating tools project files
-echo.
-create_project ..\.. --tools --msvc --msvc-version 10
-goto done
-
-:tests
-echo.
-echo Creating tests project files
-echo.
-create_project ..\.. --tests --msvc --msvc-version 10
-goto done
-
-:clean_check
-echo.
-set cleananswer=N
-set /p cleananswer="This will remove all project files. Are you sure you want to continue? (N/y)"
-if "%cleananswer%"=="n" goto done
-if "%cleananswer%"=="N" goto done
-if "%cleananswer%"=="y" goto clean
-if "%cleananswer%"=="Y" goto clean
-goto clean_check
-
-:clean
-echo.
-echo Removing all project files
-del /Q *.vcxproj* > NUL 2>&1
-del /Q *.props > NUL 2>&1
-del /Q *.sln* > NUL 2>&1
-del /Q scummvm* > NUL 2>&1
-del /Q devtools* > NUL 2>&1
-del /Q test_runner.cpp > NUL 2>&1
-goto done
-
-:done
-echo.
-pause
diff --git a/dists/msvc10/readme.txt b/dists/msvc10/readme.txt
deleted file mode 100644
index fa077fa485..0000000000
--- a/dists/msvc10/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The Visual Studio project files can now be created automatically from the GCC
-files using the create_project tool inside the /devtools/create_project folder.
-
-To create the default project files, build create_project.exe, copy it inside
-this folder and run the create_msvc10.bat file for a default build. You can run
-create_project.exe with no parameters to check the possible command-line options
diff --git a/dists/msvc11/create_msvc11.bat b/dists/msvc11/create_msvc11.bat
deleted file mode 100644
index 7d667b0591..0000000000
--- a/dists/msvc11/create_msvc11.bat
+++ /dev/null
@@ -1,105 +0,0 @@
-@echo off
-
-echo.
-echo Automatic creation of the MSVC11 project files
-echo.
-
-if "%~1"=="/stable" goto stable
-if "%~1"=="/STABLE" goto stable
-if "%~1"=="/all"    goto all
-if "%~1"=="/ALL"    goto all
-if "%~1"=="/tools"  goto tools
-if "%~1"=="/TOOLS"  goto tools
-if "%~1"=="/tests"  goto tests
-if "%~1"=="/TESTS"  goto tests
-if "%~1"=="/clean"  goto clean_check
-if "%~1"=="/CLEAN"  goto clean_check
-if "%~1"=="/help"   goto command_help
-if "%~1"=="/HELP"   goto command_help
-if "%~1"=="/?"      goto command_help
-
-if "%~1"==""        goto check_tool
-
-echo Invalid command parameter: %~1
-echo.
-
-:command_help
-echo Valid command parameters are:
-echo   stable   Generated stable engines project files
-echo   all      Generate all engines project files
-echo   tools    Generate project files for the devtools
-echo   clean    Clean generated project files
-echo   help     Show help message
-goto done
-
-:check_tool
-if not exist create_project.exe goto no_tool
-
-:question
-echo.
-set batchanswer=S
-set /p batchanswer="Enable stable engines only, or all engines? (S/a)"
-if "%batchanswer%"=="s" goto stable
-if "%batchanswer%"=="S" goto stable
-if "%batchanswer%"=="a" goto all
-if "%batchanswer%"=="A" goto all
-goto question
-
-:no_tool
-echo create_project.exe not found in the current folder.
-echo You need to build it first and copy it in this
-echo folder
-goto done
-
-:all
-echo.
-echo Creating project files with all engines enabled (stable and unstable)
-echo.
-create_project ..\.. --enable-all-engines --disable-fluidsynth --disable-sdlnet --disable-libcurl --disable-updates --msvc --msvc-version 11 --build-events
-goto done
-
-:stable
-echo.
-echo Creating normal project files, with only the stable engines enabled
-echo.
-create_project ..\.. --disable-fluidsynth --disable-sdlnet --disable-libcurl --disable-updates --msvc --msvc-version 11
-goto done
-
-:tools
-echo.
-echo Creating tools project files
-echo.
-create_project ..\.. --tools --msvc --msvc-version 11
-goto done
-
-:tests
-echo.
-echo Creating tests project files
-echo.
-create_project ..\.. --tests --msvc --msvc-version 11
-goto done
-
-:clean_check
-echo.
-set cleananswer=N
-set /p cleananswer="This will remove all project files. Are you sure you want to continue? (N/y)"
-if "%cleananswer%"=="n" goto done
-if "%cleananswer%"=="N" goto done
-if "%cleananswer%"=="y" goto clean
-if "%cleananswer%"=="Y" goto clean
-goto clean_check
-
-:clean
-echo.
-echo Removing all project files
-del /Q *.vcxproj* > NUL 2>&1
-del /Q *.props > NUL 2>&1
-del /Q *.sln* > NUL 2>&1
-del /Q scummvm* > NUL 2>&1
-del /Q devtools* > NUL 2>&1
-del /Q test_runner.cpp > NUL 2>&1
-goto done
-
-:done
-echo.
-pause
diff --git a/dists/msvc11/readme.txt b/dists/msvc11/readme.txt
deleted file mode 100644
index 45faac0663..0000000000
--- a/dists/msvc11/readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-The Visual Studio project files can now be created automatically from the GCC
-files using the create_project tool inside the /devtools/create_project folder.
-
-To create the default project files, build create_project.exe, copy it inside
-this folder and run the create_msvc11.bat file for a default build. You can run
-create_project.exe with no parameters to check the possible command-line options.
-
-To enable debug visualization for common types, see the comment in
-/devtools/create_project/scripts/scummvm.natvis.
diff --git a/dists/msvc12/create_msvc12.bat b/dists/msvc12/create_msvc12.bat
deleted file mode 100644
index d28bc65ad9..0000000000
--- a/dists/msvc12/create_msvc12.bat
+++ /dev/null
@@ -1,105 +0,0 @@
-@echo off
-
-echo.
-echo Automatic creation of the MSVC12 project files
-echo.
-
-if "%~1"=="/stable" goto stable
-if "%~1"=="/STABLE" goto stable
-if "%~1"=="/all"    goto all
-if "%~1"=="/ALL"    goto all
-if "%~1"=="/tools"  goto tools
-if "%~1"=="/TOOLS"  goto tools
-if "%~1"=="/tests"  goto tests
-if "%~1"=="/TESTS"  goto tests
-if "%~1"=="/clean"  goto clean_check
-if "%~1"=="/CLEAN"  goto clean_check
-if "%~1"=="/help"   goto command_help
-if "%~1"=="/HELP"   goto command_help
-if "%~1"=="/?"      goto command_help
-
-if "%~1"==""        goto check_tool
-
-echo Invalid command parameter: %~1
-echo.
-
-:command_help
-echo Valid command parameters are:
-echo   stable   Generated stable engines project files
-echo   all      Generate all engines project files
-echo   tools    Generate project files for the devtools
-echo   clean    Clean generated project files
-echo   help     Show help message
-goto done
-
-:check_tool
-if not exist create_project.exe goto no_tool
-
-:question
-echo.
-set batchanswer=S
-set /p batchanswer="Enable stable engines only, or all engines? (S/a)"
-if "%batchanswer%"=="s" goto stable
-if "%batchanswer%"=="S" goto stable
-if "%batchanswer%"=="a" goto all
-if "%batchanswer%"=="A" goto all
-goto question
-
-:no_tool
-echo create_project.exe not found in the current folder.
-echo You need to build it first and copy it in this
-echo folder
-goto done
-
-:all
-echo.
-echo Creating project files with all engines enabled (stable and unstable)
-echo.
-create_project ..\.. --enable-all-engines --disable-fluidsynth --disable-sdlnet --disable-libcurl --disable-updates --msvc --msvc-version 12 --build-events
-goto done
-
-:stable
-echo.
-echo Creating normal project files, with only the stable engines enabled
-echo.
-create_project ..\.. --disable-fluidsynth --disable-sdlnet --disable-libcurl --disable-updates --msvc --msvc-version 12
-goto done
-
-:tools
-echo.
-echo Creating tools project files
-echo.
-create_project ..\.. --tools --msvc --msvc-version 12
-goto done
-
-:tests
-echo.
-echo Creating tests project files
-echo.
-create_project ..\.. --tests --msvc --msvc-version 12
-goto done
-
-:clean_check
-echo.
-set cleananswer=N
-set /p cleananswer="This will remove all project files. Are you sure you want to continue? (N/y)"
-if "%cleananswer%"=="n" goto done
-if "%cleananswer%"=="N" goto done
-if "%cleananswer%"=="y" goto clean
-if "%cleananswer%"=="Y" goto clean
-goto clean_check
-
-:clean
-echo.
-echo Removing all project files
-del /Q *.vcxproj* > NUL 2>&1
-del /Q *.props > NUL 2>&1
-del /Q *.sln* > NUL 2>&1
-del /Q scummvm* > NUL 2>&1
-del /Q devtools* > NUL 2>&1
-del /Q test_runner.cpp > NUL 2>&1
-goto done
-
-:done
-echo.
-pause
diff --git a/dists/msvc14/create_msvc14.bat b/dists/msvc14/create_msvc14.bat
deleted file mode 100644
index 4a16c43c45..0000000000
--- a/dists/msvc14/create_msvc14.bat
+++ /dev/null
@@ -1,105 +0,0 @@
-@echo off
-
-echo.
-echo Automatic creation of the MSVC14 project files
-echo.
-
-if "%~1"=="/stable" goto stable
-if "%~1"=="/STABLE" goto stable
-if "%~1"=="/all"    goto all
-if "%~1"=="/ALL"    goto all
-if "%~1"=="/tools"  goto tools
-if "%~1"=="/TOOLS"  goto tools
-if "%~1"=="/tests"  goto tests
-if "%~1"=="/TESTS"  goto tests
-if "%~1"=="/clean"  goto clean_check
-if "%~1"=="/CLEAN"  goto clean_check
-if "%~1"=="/help"   goto command_help
-if "%~1"=="/HELP"   goto command_help
-if "%~1"=="/?"      goto command_help
-
-if "%~1"==""        goto check_tool
-
-echo Invalid command parameter: %~1
-echo.
-
-:command_help
-echo Valid command parameters are:
-echo   stable   Generated stable engines project files
-echo   all      Generate all engines project files
-echo   tools    Generate project files for the devtools
-echo   clean    Clean generated project files
-echo   help     Show help message
-goto done
-
-:check_tool
-if not exist create_project.exe goto no_tool
-
-:question
-echo.
-set batchanswer=S
-set /p batchanswer="Enable stable engines only, or all engines? (S/a)"
-if "%batchanswer%"=="s" goto stable
-if "%batchanswer%"=="S" goto stable
-if "%batchanswer%"=="a" goto all
-if "%batchanswer%"=="A" goto all
-goto question
-
-:no_tool
-echo create_project.exe not found in the current folder.
-echo You need to build it first and copy it in this
-echo folder
-goto done
-
-:all
-echo.
-echo Creating project files with all engines enabled (stable and unstable)
-echo.
-create_project ..\.. --enable-all-engines --disable-fluidsynth --msvc --msvc-version 14 --build-events
-goto done
-
-:stable
-echo.
-echo Creating normal project files, with only the stable engines enabled
-echo.
-create_project ..\.. --disable-fluidsynth --msvc --msvc-version 14
-goto done
-
-:tools
-echo.
-echo Creating tools project files
-echo.
-create_project ..\.. --tools --msvc --msvc-version 14
-goto done
-
-:tests
-echo.
-echo Creating tests project files
-echo.
-create_project ..\.. --tests --msvc --msvc-version 14
-goto done
-
-:clean_check
-echo.
-set cleananswer=N
-set /p cleananswer="This will remove all project files. Are you sure you want to continue? (N/y)"
-if "%cleananswer%"=="n" goto done
-if "%cleananswer%"=="N" goto done
-if "%cleananswer%"=="y" goto clean
-if "%cleananswer%"=="Y" goto clean
-goto clean_check
-
-:clean
-echo.
-echo Removing all project files
-del /Q *.vcxproj* > NUL 2>&1
-del /Q *.props > NUL 2>&1
-del /Q *.sln* > NUL 2>&1
-del /Q scummvm* > NUL 2>&1
-del /Q devtools* > NUL 2>&1
-del /Q test_runner.cpp > NUL 2>&1
-goto done
-
-:done
-echo.
-pause
diff --git a/dists/msvc14/readme.txt b/dists/msvc14/readme.txt
deleted file mode 100644
index 3d16c7b20b..0000000000
--- a/dists/msvc14/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The Visual Studio project files can now be created automatically from the GCC
-files using the create_project tool inside the /devtools/create_project folder.
-
-To create the default project files, build create_project.exe, copy it inside
-this folder and run the create_msvc14.bat file for a default build. You can run
-create_project.exe with no parameters to check the possible command-line options.
diff --git a/dists/msvc15/readme.txt b/dists/msvc15/readme.txt
deleted file mode 100644
index bce3ffbaae..0000000000
--- a/dists/msvc15/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The Visual Studio project files can now be created automatically from the GCC
-files using the create_project tool inside the /devtools/create_project folder.
-
-To create the default project files, build create_project.exe, copy it inside
-this folder and run the create_msvc15.bat file for a default build. You can run
-create_project.exe with no parameters to check the possible command-line options.
diff --git a/dists/msvc9/create_msvc9.bat b/dists/msvc9/create_msvc9.bat
deleted file mode 100644
index 5151c89da9..0000000000
--- a/dists/msvc9/create_msvc9.bat
+++ /dev/null
@@ -1,105 +0,0 @@
-@echo off
-
-echo.
-echo Automatic creation of the MSVC9 project files
-echo.
-
-if "%~1"=="/stable" goto stable
-if "%~1"=="/STABLE" goto stable
-if "%~1"=="/all"    goto all
-if "%~1"=="/ALL"    goto all
-if "%~1"=="/tools"  goto tools
-if "%~1"=="/TOOLS"  goto tools
-if "%~1"=="/tests"  goto tests
-if "%~1"=="/TESTS"  goto tests
-if "%~1"=="/clean"  goto clean_check
-if "%~1"=="/CLEAN"  goto clean_check
-if "%~1"=="/help"   goto command_help
-if "%~1"=="/HELP"   goto command_help
-if "%~1"=="/?"      goto command_help
-
-if "%~1"==""        goto check_tool
-
-echo Invalid command parameter: %~1
-echo.
-
-:command_help
-echo Valid command parameters are:
-echo   stable   Generated stable engines project files
-echo   all      Generate all engines project files
-echo   tools    Generate project files for the devtools
-echo   clean    Clean generated project files
-echo   help     Show help message
-goto done
-
-:check_tool
-if not exist create_project.exe goto no_tool
-
-:question
-echo.
-set batchanswer=S
-set /p batchanswer="Enable stable engines only, or all engines? (S/a)"
-if "%batchanswer%"=="s" goto stable
-if "%batchanswer%"=="S" goto stable
-if "%batchanswer%"=="a" goto all
-if "%batchanswer%"=="A" goto all
-goto question
-
-:no_tool
-echo create_project.exe not found in the current folder.
-echo You need to build it first and copy it in this
-echo folder
-goto done
-
-:all
-echo.
-echo Creating project files with all engines enabled (stable and unstable)
-echo.
-create_project ..\.. --enable-all-engines --disable-fluidsynth --disable-sdlnet --disable-libcurl --disable-updates --msvc --msvc-version 9
-goto done
-
-:stable
-echo.
-echo Creating normal project files, with only the stable engines enabled
-echo.
-create_project ..\.. --disable-fluidsynth --disable-sdlnet --disable-libcurl --disable-updates --msvc --msvc-version 9
-goto done
-
-:tools
-echo.
-echo Creating tools project files
-echo.
-create_project ..\.. --tools --msvc --msvc-version 9
-goto done
-
-:tests
-echo.
-echo Creating tests project files
-echo.
-create_project ..\.. --tests --msvc --msvc-version 9
-goto done
-
-:clean_check
-echo.
-set cleananswer=N
-set /p cleananswer="This will remove all project files. Are you sure you want to continue? (N/y)"
-if "%cleananswer%"=="n" goto done
-if "%cleananswer%"=="N" goto done
-if "%cleananswer%"=="y" goto clean
-if "%cleananswer%"=="Y" goto clean
-goto clean_check
-
-:clean
-echo.
-echo Removing all project files
-del /Q *.vcproj* > NUL 2>&1
-del /Q *.vsprops > NUL 2>&1
-del /Q *.sln* > NUL 2>&1
-del /Q scummvm* > NUL 2>&1
-del /Q devtools* > NUL 2>&1
-del /Q test_runner.cpp
-goto done
-
-:done
-echo.
-pause
diff --git a/dists/msvc9/readme.txt b/dists/msvc9/readme.txt
deleted file mode 100644
index 410b8ea403..0000000000
--- a/dists/msvc9/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The Visual Studio project files can now be created automatically from the GCC
-files using the create_project tool inside the /devtools/create_project folder.
-
-To create the default project files, build create_project.exe, copy it inside
-this folder and run the create_msvc9.bat file for a default build. You can run
-create_project.exe with no parameters to check the possible command-line options