From be0150fd855d72ac01844a024d39ba9518db914a Mon Sep 17 00:00:00 2001 From: SupSuper Date: Tue, 16 Apr 2019 02:49:08 +0100 Subject: DISTS: Merge MSVC versions into one folder --- .gitignore | 21 +- devtools/create_project/msvc/create_project.sln | 20 ++ .../create_project/msvc/create_project.vcxproj | 125 ++++++++++ .../msvc/create_project.vcxproj.filters | 83 +++++++ .../create_project/msvc/create_project_2008.sln | 20 ++ .../create_project/msvc/create_project_2008.vcproj | 270 +++++++++++++++++++++ devtools/create_project/msvc10/create_project.sln | 20 -- .../create_project/msvc10/create_project.vcxproj | 125 ---------- .../msvc10/create_project.vcxproj.filters | 71 ------ devtools/create_project/msvc11/create_project.sln | 20 -- .../create_project/msvc11/create_project.vcxproj | 131 ---------- .../msvc11/create_project.vcxproj.filters | 71 ------ devtools/create_project/msvc12/create_project.sln | 20 -- .../create_project/msvc12/create_project.vcxproj | 132 ---------- .../msvc12/create_project.vcxproj.filters | 71 ------ devtools/create_project/msvc14/create_project.sln | 28 --- .../create_project/msvc14/create_project.vcxproj | 221 ----------------- .../msvc14/create_project.vcxproj.filters | 76 ------ devtools/create_project/msvc15/create_project.sln | 28 --- .../create_project/msvc15/create_project.vcxproj | 224 ----------------- .../msvc15/create_project.vcxproj.filters | 82 ------- devtools/create_project/msvc9/create_project.sln | 20 -- .../create_project/msvc9/create_project.vcproj | 260 -------------------- dists/msvc/create_msvc.bat | 107 ++++++++ dists/msvc/readme.txt | 9 + dists/msvc10/create_msvc10.bat | 105 -------- dists/msvc10/readme.txt | 6 - dists/msvc11/create_msvc11.bat | 105 -------- dists/msvc11/readme.txt | 9 - dists/msvc12/create_msvc12.bat | 105 -------- dists/msvc12/readme.txt | 9 - dists/msvc14/create_msvc14.bat | 105 -------- dists/msvc14/readme.txt | 6 - dists/msvc15/create_msvc15.bat | 105 -------- dists/msvc15/readme.txt | 6 - dists/msvc9/create_msvc9.bat | 105 -------- dists/msvc9/readme.txt | 6 - ports.mk | 14 +- 38 files changed, 647 insertions(+), 2294 deletions(-) create mode 100644 devtools/create_project/msvc/create_project.sln create mode 100644 devtools/create_project/msvc/create_project.vcxproj create mode 100644 devtools/create_project/msvc/create_project.vcxproj.filters create mode 100644 devtools/create_project/msvc/create_project_2008.sln create mode 100644 devtools/create_project/msvc/create_project_2008.vcproj delete mode 100644 devtools/create_project/msvc10/create_project.sln delete mode 100644 devtools/create_project/msvc10/create_project.vcxproj delete mode 100644 devtools/create_project/msvc10/create_project.vcxproj.filters delete mode 100644 devtools/create_project/msvc11/create_project.sln delete mode 100644 devtools/create_project/msvc11/create_project.vcxproj delete mode 100644 devtools/create_project/msvc11/create_project.vcxproj.filters delete mode 100644 devtools/create_project/msvc12/create_project.sln delete mode 100644 devtools/create_project/msvc12/create_project.vcxproj delete mode 100644 devtools/create_project/msvc12/create_project.vcxproj.filters delete mode 100644 devtools/create_project/msvc14/create_project.sln delete mode 100644 devtools/create_project/msvc14/create_project.vcxproj delete mode 100644 devtools/create_project/msvc14/create_project.vcxproj.filters delete mode 100644 devtools/create_project/msvc15/create_project.sln delete mode 100644 devtools/create_project/msvc15/create_project.vcxproj delete mode 100644 devtools/create_project/msvc15/create_project.vcxproj.filters delete mode 100644 devtools/create_project/msvc9/create_project.sln delete mode 100644 devtools/create_project/msvc9/create_project.vcproj create mode 100644 dists/msvc/create_msvc.bat create mode 100644 dists/msvc/readme.txt delete mode 100644 dists/msvc10/create_msvc10.bat delete mode 100644 dists/msvc10/readme.txt delete mode 100644 dists/msvc11/create_msvc11.bat delete mode 100644 dists/msvc11/readme.txt delete mode 100644 dists/msvc12/create_msvc12.bat delete mode 100644 dists/msvc12/readme.txt delete mode 100644 dists/msvc14/create_msvc14.bat delete mode 100644 dists/msvc14/readme.txt delete mode 100644 dists/msvc15/create_msvc15.bat delete mode 100644 dists/msvc15/readme.txt delete mode 100644 dists/msvc9/create_msvc9.bat delete mode 100644 dists/msvc9/readme.txt diff --git a/.gitignore b/.gitignore index 50f0268ea5..ed6b6e02d2 100644 --- a/.gitignore +++ b/.gitignore @@ -105,14 +105,14 @@ project.xcworkspace /dists/macosx/scummvm.xcodeproj /dists/macosx/create_project -/dists/msvc*/[Dd]ebug*/ -/dists/msvc*/[Rr]elease*/ -/dists/msvc*/[Aa]nalysis*/ -/dists/msvc*/*.lib -/dists/msvc*/*.SAV -/dists/msvc*/*.dat -/dists/msvc*/*.dll -/dists/msvc*/test_runner.cpp +/dists/msvc/[Dd]ebug*/ +/dists/msvc/[Rr]elease*/ +/dists/msvc/[Aa]nalysis*/ +/dists/msvc/*.lib +/dists/msvc/*.SAV +/dists/msvc/*.dat +/dists/msvc/*.dll +/dists/msvc/test_runner.cpp /dists/engine-data/testbed-audiocd-files/testbed.config /dists/engine-data/testbed-audiocd-files/testbed.out @@ -193,6 +193,7 @@ ipch/ *.tss *.VC.db .vs/ +UpgradeLog.htm #Ignore default Visual Studio build folders [Dd]ebug/ @@ -223,8 +224,8 @@ ScummVM.includes .DS_Store #Ignore MS Visual C++ temporary files/subdirectories (except create_project.bat) -dists/msvc*/** -!dists/msvc*/create_project.bat +dists/msvc/** +!dists/msvc/create_project.bat #Ignore bison debug output *.output diff --git a/devtools/create_project/msvc/create_project.sln b/devtools/create_project/msvc/create_project.sln new file mode 100644 index 0000000000..69eeb8ed19 --- /dev/null +++ b/devtools/create_project/msvc/create_project.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcxproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/devtools/create_project/msvc/create_project.vcxproj b/devtools/create_project/msvc/create_project.vcxproj new file mode 100644 index 0000000000..f582ebbbb0 --- /dev/null +++ b/devtools/create_project/msvc/create_project.vcxproj @@ -0,0 +1,125 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {CF177559-077D-4A08-AABE-BE0FD35F6C63} + create_project + + + + Application + MultiByte + true + $(DefaultPlatformToolset) + + + Application + MultiByte + $(DefaultPlatformToolset) + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + EnableFastChecks + MultiThreadedDebugDLL + Level4 + EditAndContinue + false + 4003;4512;4127;4100;4244 + true + + + Rpcrt4.lib;%(AdditionalDependencies) + true + MachineX86 + false + + + @echo off +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\" + + + + + MaxSpeed + true + MultiThreadedDLL + true + Level3 + ProgramDatabase + 4003;4512;4127 + true + + + Rpcrt4.lib;%(AdditionalDependencies) + true + true + true + MachineX86 + + + @echo off +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/devtools/create_project/msvc/create_project.vcxproj.filters b/devtools/create_project/msvc/create_project.vcxproj.filters new file mode 100644 index 0000000000..b29f1d2989 --- /dev/null +++ b/devtools/create_project/msvc/create_project.vcxproj.filters @@ -0,0 +1,83 @@ + + + + + {2e3580c8-ec3a-4c81-8351-b668c668db2a} + + + {31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6} + + + {f980f6fb-41b6-4161-b035-58b200c85cad} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + scripts + + + scripts + + + scripts + + + scripts + + + scripts + + + scripts + + + \ No newline at end of file diff --git a/devtools/create_project/msvc/create_project_2008.sln b/devtools/create_project/msvc/create_project_2008.sln new file mode 100644 index 0000000000..4eaa6f04df --- /dev/null +++ b/devtools/create_project/msvc/create_project_2008.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project_2008.vcproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/devtools/create_project/msvc/create_project_2008.vcproj b/devtools/create_project/msvc/create_project_2008.vcproj new file mode 100644 index 0000000000..d41fe80933 --- /dev/null +++ b/devtools/create_project/msvc/create_project_2008.vcproj @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/devtools/create_project/msvc10/create_project.sln b/devtools/create_project/msvc10/create_project.sln deleted file mode 100644 index 69eeb8ed19..0000000000 --- a/devtools/create_project/msvc10/create_project.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcxproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/devtools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc10/create_project.vcxproj deleted file mode 100644 index bc6f634486..0000000000 --- a/devtools/create_project/msvc10/create_project.vcxproj +++ /dev/null @@ -1,125 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {CF177559-077D-4A08-AABE-BE0FD35F6C63} - create_project - - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - - Disabled - true - EnableFastChecks - MultiThreadedDebugDLL - Level4 - EditAndContinue - false - 4003;4512;4127;4100;4244 - - - Rpcrt4.lib;%(AdditionalDependencies) - true - MachineX86 - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - MaxSpeed - true - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4003;4512;4127 - - - Rpcrt4.lib;%(AdditionalDependencies) - true - true - true - MachineX86 - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/devtools/create_project/msvc10/create_project.vcxproj.filters b/devtools/create_project/msvc10/create_project.vcxproj.filters deleted file mode 100644 index b4f0b18774..0000000000 --- a/devtools/create_project/msvc10/create_project.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {2e3580c8-ec3a-4c81-8351-b668c668db2a} - - - {31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6} - - - {f980f6fb-41b6-4161-b035-58b200c85cad} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - scripts - - - scripts - - - scripts - - - scripts - - - diff --git a/devtools/create_project/msvc11/create_project.sln b/devtools/create_project/msvc11/create_project.sln deleted file mode 100644 index 1552c9f502..0000000000 --- a/devtools/create_project/msvc11/create_project.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcxproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/devtools/create_project/msvc11/create_project.vcxproj b/devtools/create_project/msvc11/create_project.vcxproj deleted file mode 100644 index 74fa93730b..0000000000 --- a/devtools/create_project/msvc11/create_project.vcxproj +++ /dev/null @@ -1,131 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {CF177559-077D-4A08-AABE-BE0FD35F6C63} - create_project - $(VCTargetsPath11) - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - - Disabled - true - EnableFastChecks - MultiThreadedDebugDLL - Level4 - EditAndContinue - false - 4003;4512;4127;4100;4244 - - - Rpcrt4.lib;%(AdditionalDependencies) - true - MachineX86 - false - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - MaxSpeed - true - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4003;4512;4127 - - - Rpcrt4.lib;%(AdditionalDependencies) - true - true - true - MachineX86 - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/devtools/create_project/msvc11/create_project.vcxproj.filters b/devtools/create_project/msvc11/create_project.vcxproj.filters deleted file mode 100644 index b4f0b18774..0000000000 --- a/devtools/create_project/msvc11/create_project.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {2e3580c8-ec3a-4c81-8351-b668c668db2a} - - - {31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6} - - - {f980f6fb-41b6-4161-b035-58b200c85cad} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - scripts - - - scripts - - - scripts - - - scripts - - - diff --git a/devtools/create_project/msvc12/create_project.sln b/devtools/create_project/msvc12/create_project.sln deleted file mode 100644 index 759d5430f5..0000000000 --- a/devtools/create_project/msvc12/create_project.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcxproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/devtools/create_project/msvc12/create_project.vcxproj b/devtools/create_project/msvc12/create_project.vcxproj deleted file mode 100644 index f8afe4c0e4..0000000000 --- a/devtools/create_project/msvc12/create_project.vcxproj +++ /dev/null @@ -1,132 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {CF177559-077D-4A08-AABE-BE0FD35F6C63} - create_project - $(VCTargetsPath11) - - - - Application - MultiByte - true - v120 - - - Application - MultiByte - v120 - - - - - - - - - - - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - - Disabled - true - EnableFastChecks - MultiThreadedDebugDLL - Level4 - EditAndContinue - false - 4003;4512;4127;4100;4244 - - - Rpcrt4.lib;%(AdditionalDependencies) - true - MachineX86 - false - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - MaxSpeed - true - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4003;4512;4127 - - - Rpcrt4.lib;%(AdditionalDependencies) - true - true - true - MachineX86 - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/devtools/create_project/msvc12/create_project.vcxproj.filters b/devtools/create_project/msvc12/create_project.vcxproj.filters deleted file mode 100644 index 436d1d3436..0000000000 --- a/devtools/create_project/msvc12/create_project.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {2e3580c8-ec3a-4c81-8351-b668c668db2a} - - - {31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6} - - - {f980f6fb-41b6-4161-b035-58b200c85cad} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - scripts - - - scripts - - - scripts - - - scripts - - - diff --git a/devtools/create_project/msvc14/create_project.sln b/devtools/create_project/msvc14/create_project.sln deleted file mode 100644 index 73f0b3569e..0000000000 --- a/devtools/create_project/msvc14/create_project.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.22609.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcxproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|x64.ActiveCfg = Debug|x64 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|x64.Build.0 = Debug|x64 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|x64.ActiveCfg = Release|x64 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/devtools/create_project/msvc14/create_project.vcxproj b/devtools/create_project/msvc14/create_project.vcxproj deleted file mode 100644 index 1ac132d268..0000000000 --- a/devtools/create_project/msvc14/create_project.vcxproj +++ /dev/null @@ -1,221 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CF177559-077D-4A08-AABE-BE0FD35F6C63} - create_project - - - - Application - MultiByte - true - v140 - - - Application - MultiByte - true - v140 - - - Application - MultiByte - v140 - - - Application - MultiByte - v140 - - - - - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - - Disabled - true - EnableFastChecks - MultiThreadedDebugDLL - Level4 - EditAndContinue - false - 4003;4512;4127;4100;4244 - Sync - - - Rpcrt4.lib;%(AdditionalDependencies) - true - MachineX86 - false - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc14\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - Disabled - EnableFastChecks - MultiThreadedDebugDLL - Level4 - ProgramDatabase - false - 4003;4512;4127 - - - Rpcrt4.lib;%(AdditionalDependencies) - true - false - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc14\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - MaxSpeed - true - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4003;4512;4127 - true - - - Rpcrt4.lib;%(AdditionalDependencies) - true - true - true - MachineX86 - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc14\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - - - - - MaxSpeed - true - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4003;4512;4127 - true - - - Rpcrt4.lib;%(AdditionalDependencies) - true - true - true - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc14\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/devtools/create_project/msvc14/create_project.vcxproj.filters b/devtools/create_project/msvc14/create_project.vcxproj.filters deleted file mode 100644 index 16c6df081d..0000000000 --- a/devtools/create_project/msvc14/create_project.vcxproj.filters +++ /dev/null @@ -1,76 +0,0 @@ - - - - - {2e3580c8-ec3a-4c81-8351-b668c668db2a} - - - {31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6} - - - {f980f6fb-41b6-4161-b035-58b200c85cad} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - scripts - - - scripts - - - scripts - - - scripts - - - - - scripts - - - \ No newline at end of file diff --git a/devtools/create_project/msvc15/create_project.sln b/devtools/create_project/msvc15/create_project.sln deleted file mode 100644 index 73f0b3569e..0000000000 --- a/devtools/create_project/msvc15/create_project.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.22609.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcxproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|x64.ActiveCfg = Debug|x64 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|x64.Build.0 = Debug|x64 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|x64.ActiveCfg = Release|x64 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/devtools/create_project/msvc15/create_project.vcxproj b/devtools/create_project/msvc15/create_project.vcxproj deleted file mode 100644 index 1ead51cff9..0000000000 --- a/devtools/create_project/msvc15/create_project.vcxproj +++ /dev/null @@ -1,224 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {CF177559-077D-4A08-AABE-BE0FD35F6C63} - create_project - - - - Application - MultiByte - true - v141 - - - Application - MultiByte - true - v141 - - - Application - MultiByte - v141 - - - Application - MultiByte - v141 - - - - - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - - - - Disabled - EnableFastChecks - MultiThreadedDebugDLL - Level4 - EditAndContinue - false - 4003;4512;4127;4100;4244 - Sync - - - Rpcrt4.lib;%(AdditionalDependencies) - true - MachineX86 - false - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc15\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc14\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - Disabled - EnableFastChecks - MultiThreadedDebugDLL - Level4 - ProgramDatabase - false - 4003;4512;4127 - - - Rpcrt4.lib;%(AdditionalDependencies) - true - false - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc15\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc14\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - MaxSpeed - true - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4003;4512;4127 - true - - - Rpcrt4.lib;%(AdditionalDependencies) - true - true - true - MachineX86 - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc15\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc14\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - - - - - MaxSpeed - true - MultiThreadedDLL - true - Level3 - ProgramDatabase - 4003;4512;4127 - true - - - Rpcrt4.lib;%(AdditionalDependencies) - true - true - true - - - @echo off -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc15\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc14\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" -xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/devtools/create_project/msvc15/create_project.vcxproj.filters b/devtools/create_project/msvc15/create_project.vcxproj.filters deleted file mode 100644 index b6da1e9df6..0000000000 --- a/devtools/create_project/msvc15/create_project.vcxproj.filters +++ /dev/null @@ -1,82 +0,0 @@ - - - - - {2e3580c8-ec3a-4c81-8351-b668c668db2a} - - - {31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6} - - - {f980f6fb-41b6-4161-b035-58b200c85cad} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - scripts - - - scripts - - - scripts - - - scripts - - - - - scripts - - - \ No newline at end of file diff --git a/devtools/create_project/msvc9/create_project.sln b/devtools/create_project/msvc9/create_project.sln deleted file mode 100644 index df754e1d78..0000000000 --- a/devtools/create_project/msvc9/create_project.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 - {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/devtools/create_project/msvc9/create_project.vcproj b/devtools/create_project/msvc9/create_project.vcproj deleted file mode 100644 index 0069f2ab9c..0000000000 --- a/devtools/create_project/msvc9/create_project.vcproj +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dists/msvc/create_msvc.bat b/dists/msvc/create_msvc.bat new file mode 100644 index 0000000000..73305eac85 --- /dev/null +++ b/dists/msvc/create_msvc.bat @@ -0,0 +1,107 @@ +@echo off + +echo. +echo Automatic creation of the MSVC 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 --build-events +goto done + +:stable +echo. +echo Creating normal project files, with only the stable engines enabled +echo. +create_project ..\.. --disable-fluidsynth --msvc +goto done + +:tools +echo. +echo Creating tools project files +echo. +create_project ..\.. --tools --msvc +goto done + +:tests +echo. +echo Creating tests project files +echo. +create_project ..\.. --tests --msvc +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 *.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/msvc/readme.txt b/dists/msvc/readme.txt new file mode 100644 index 0000000000..e0da7f14c0 --- /dev/null +++ b/dists/msvc/readme.txt @@ -0,0 +1,9 @@ +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_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 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/msvc12/readme.txt b/dists/msvc12/readme.txt deleted file mode 100644 index 2d91c72140..0000000000 --- a/dists/msvc12/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_msvc12.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/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/create_msvc15.bat b/dists/msvc15/create_msvc15.bat deleted file mode 100644 index 283fd43f56..0000000000 --- a/dists/msvc15/create_msvc15.bat +++ /dev/null @@ -1,105 +0,0 @@ -@echo off - -echo. -echo Automatic creation of the MSVC15 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 15 --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 -goto done - -:tools -echo. -echo Creating tools project files -echo. -create_project ..\.. --tools --msvc --msvc-version 15 -goto done - -:tests -echo. -echo Creating tests project files -echo. -create_project ..\.. --tests --msvc --msvc-version 15 -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/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 diff --git a/ports.mk b/ports.mk index aa63a11e06..913ca5c567 100644 --- a/ports.mk +++ b/ports.mk @@ -460,18 +460,8 @@ else ifeq "$(CUR_BRANCH)" "" endif @echo Creating Code::Blocks project files... @cd $(srcdir)/dists/codeblocks && ../../devtools/create_project/create_project ../.. --codeblocks >/dev/null && git add -f engines/plugins_table.h *.workspace *.cbp - @echo Creating MSVC9 project files... - @cd $(srcdir)/dists/msvc9 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 9 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcproj *.vsprops - @echo Creating MSVC10 project files... - @cd $(srcdir)/dists/msvc10 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 10 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props - @echo Creating MSVC11 project files... - @cd $(srcdir)/dists/msvc11 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 11 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props - @echo Creating MSVC12 project files... - @cd $(srcdir)/dists/msvc12 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 12 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props - @echo Creating MSVC14 project files... - @cd $(srcdir)/dists/msvc14 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 14 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props - @echo Creating MSVC15 project files... - @cd $(srcdir)/dists/msvc15 && ../../devtools/create_project/create_project ../.. --msvc --msvc-version 15 >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props + @echo Creating MSVC project files... + @cd $(srcdir)/dists/msvc && ../../devtools/create_project/create_project ../.. --msvc >/dev/null && git add -f engines/plugins_table.h *.sln *.vcxproj *.vcxproj.filters *.props @echo @echo All is done. @echo Now run -- cgit v1.2.3