diff options
31 files changed, 50 insertions, 1697 deletions
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/msvc10/create_project.sln b/devtools/create_project/msvc/create_project.sln index 69eeb8ed19..69eeb8ed19 100644 --- a/devtools/create_project/msvc10/create_project.sln +++ b/devtools/create_project/msvc/create_project.sln diff --git a/devtools/create_project/msvc10/create_project.vcxproj b/devtools/create_project/msvc/create_project.vcxproj index bc6f634486..f582ebbbb0 100644 --- a/devtools/create_project/msvc10/create_project.vcxproj +++ b/devtools/create_project/msvc/create_project.vcxproj @@ -19,10 +19,12 @@ <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> @@ -44,25 +46,23 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level4</WarningLevel> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DisableLanguageExtensions>false</DisableLanguageExtensions> <DisableSpecificWarnings>4003;4512;4127;4100;4244</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> </Link> <PostBuildEvent> <Command>@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\"</Command> +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\"</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -74,6 +74,7 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DisableSpecificWarnings>4003;4512;4127</DisableSpecificWarnings> + <MultiProcessorCompilation>true</MultiProcessorCompilation> </ClCompile> <Link> <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -84,10 +85,7 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </Link> <PostBuildEvent> <Command>@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\"</Command> +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\"</Command> </PostBuildEvent> <PreBuildEvent> <Command> @@ -115,11 +113,13 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command> </ItemGroup> <ItemGroup> <None Include="..\scripts\installer.vbs" /> + <None Include="..\scripts\install-natvis.bat" /> <None Include="..\scripts\postbuild.cmd" /> <None Include="..\scripts\prebuild.cmd" /> <None Include="..\scripts\revision.vbs" /> + <None Include="..\scripts\scummvm.natvis" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/devtools/create_project/msvc15/create_project.vcxproj.filters b/devtools/create_project/msvc/create_project.vcxproj.filters index b6da1e9df6..b29f1d2989 100644 --- a/devtools/create_project/msvc15/create_project.vcxproj.filters +++ b/devtools/create_project/msvc/create_project.vcxproj.filters @@ -73,10 +73,11 @@ <None Include="..\scripts\installer.vbs"> <Filter>scripts</Filter> </None> - </ItemGroup> - <ItemGroup> - <Natvis Include="..\scripts\scummvm.natvis"> + <None Include="..\scripts\install-natvis.bat"> <Filter>scripts</Filter> - </Natvis> + </None> + <None Include="..\scripts\scummvm.natvis"> + <Filter>scripts</Filter> + </None> </ItemGroup> </Project>
\ No newline at end of file diff --git a/devtools/create_project/msvc9/create_project.sln b/devtools/create_project/msvc/create_project_2008.sln index df754e1d78..4eaa6f04df 100644 --- a/devtools/create_project/msvc9/create_project.sln +++ b/devtools/create_project/msvc/create_project_2008.sln @@ -1,7 +1,7 @@ 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}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project_2008.vcproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/devtools/create_project/msvc9/create_project.vcproj b/devtools/create_project/msvc/create_project_2008.vcproj index 0069f2ab9c..d41fe80933 100644 --- a/devtools/create_project/msvc9/create_project.vcproj +++ b/devtools/create_project/msvc/create_project_2008.vcproj @@ -82,6 +82,7 @@ /> <Tool Name="VCPostBuildEventTool" + CommandLine="@echo off
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\"" /> </Configuration> <Configuration @@ -154,6 +155,7 @@ /> <Tool Name="VCPostBuildEventTool" + CommandLine="@echo off
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc\"" /> </Configuration> </Configurations> @@ -234,7 +236,7 @@ </Filter> <Filter Name="Scripts" - Filter="vbs;cmd" + Filter="vbs;cmd;bat;natvis" UniqueIdentifier="{45B110C8-4C64-4677-8ED6-F9A93C6D55A0}" > <File @@ -253,6 +255,14 @@ RelativePath="..\scripts\installer.vbs" > </File> + <File + RelativePath="..\scripts\scummvm.natvis" + > + </File> + <File + RelativePath="..\scripts\install-natvis.bat" + > + </File> </Filter> </Files> <Globals> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Header Files"> - <UniqueIdentifier>{2e3580c8-ec3a-4c81-8351-b668c668db2a}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files"> - <UniqueIdentifier>{31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6}</UniqueIdentifier> - </Filter> - <Filter Include="scripts"> - <UniqueIdentifier>{f980f6fb-41b6-4161-b035-58b200c85cad}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\codeblocks.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\create_project.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\msvc.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\msbuild.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\visualstudio.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\xcode.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\config.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\codeblocks.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\create_project.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\msvc.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\msbuild.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\visualstudio.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\xcode.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <None Include="..\scripts\prebuild.cmd"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\revision.vbs"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\postbuild.cmd"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\installer.vbs"> - <Filter>scripts</Filter> - </None> - </ItemGroup> -</Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{CF177559-077D-4A08-AABE-BE0FD35F6C63}</ProjectGuid> - <RootNamespace>create_project</RootNamespace> - <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <DisableLanguageExtensions>false</DisableLanguageExtensions> - <DisableSpecificWarnings>4003;4512;4127;4100;4244</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4003;4512;4127</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\cmake.cpp" /> - <ClCompile Include="..\codeblocks.cpp" /> - <ClCompile Include="..\create_project.cpp" /> - <ClCompile Include="..\msbuild.cpp" /> - <ClCompile Include="..\msvc.cpp" /> - <ClCompile Include="..\visualstudio.cpp" /> - <ClCompile Include="..\xcode.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\cmake.h" /> - <ClInclude Include="..\codeblocks.h" /> - <ClInclude Include="..\config.h" /> - <ClInclude Include="..\create_project.h" /> - <ClInclude Include="..\msbuild.h" /> - <ClInclude Include="..\msvc.h" /> - <ClInclude Include="..\visualstudio.h" /> - <ClInclude Include="..\xcode.h" /> - </ItemGroup> - <ItemGroup> - <None Include="..\scripts\installer.vbs" /> - <None Include="..\scripts\postbuild.cmd" /> - <None Include="..\scripts\prebuild.cmd" /> - <None Include="..\scripts\revision.vbs" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Header Files"> - <UniqueIdentifier>{2e3580c8-ec3a-4c81-8351-b668c668db2a}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files"> - <UniqueIdentifier>{31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6}</UniqueIdentifier> - </Filter> - <Filter Include="scripts"> - <UniqueIdentifier>{f980f6fb-41b6-4161-b035-58b200c85cad}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\codeblocks.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\create_project.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\msvc.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\msbuild.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\visualstudio.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\xcode.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\config.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\codeblocks.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\create_project.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\msvc.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\msbuild.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\visualstudio.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\xcode.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <None Include="..\scripts\prebuild.cmd"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\revision.vbs"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\postbuild.cmd"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\installer.vbs"> - <Filter>scripts</Filter> - </None> - </ItemGroup> -</Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{CF177559-077D-4A08-AABE-BE0FD35F6C63}</ProjectGuid> - <RootNamespace>create_project</RootNamespace> - <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v120</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <DisableLanguageExtensions>false</DisableLanguageExtensions> - <DisableSpecificWarnings>4003;4512;4127;4100;4244</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4003;4512;4127</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\cmake.cpp" /> - <ClCompile Include="..\codeblocks.cpp" /> - <ClCompile Include="..\create_project.cpp" /> - <ClCompile Include="..\msbuild.cpp" /> - <ClCompile Include="..\msvc.cpp" /> - <ClCompile Include="..\visualstudio.cpp" /> - <ClCompile Include="..\xcode.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\cmake.h" /> - <ClInclude Include="..\codeblocks.h" /> - <ClInclude Include="..\config.h" /> - <ClInclude Include="..\create_project.h" /> - <ClInclude Include="..\msbuild.h" /> - <ClInclude Include="..\msvc.h" /> - <ClInclude Include="..\visualstudio.h" /> - <ClInclude Include="..\xcode.h" /> - </ItemGroup> - <ItemGroup> - <None Include="..\scripts\installer.vbs" /> - <None Include="..\scripts\postbuild.cmd" /> - <None Include="..\scripts\prebuild.cmd" /> - <None Include="..\scripts\revision.vbs" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Header Files"> - <UniqueIdentifier>{2e3580c8-ec3a-4c81-8351-b668c668db2a}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files"> - <UniqueIdentifier>{31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6}</UniqueIdentifier> - </Filter> - <Filter Include="scripts"> - <UniqueIdentifier>{f980f6fb-41b6-4161-b035-58b200c85cad}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\codeblocks.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\create_project.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\msvc.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\msbuild.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\visualstudio.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\xcode.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\config.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\codeblocks.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\create_project.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\msvc.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\msbuild.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\visualstudio.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\xcode.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <None Include="..\scripts\prebuild.cmd"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\revision.vbs"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\postbuild.cmd"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\installer.vbs"> - <Filter>scripts</Filter> - </None> - </ItemGroup> -</Project> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{CF177559-077D-4A08-AABE-BE0FD35F6C63}</ProjectGuid> - <RootNamespace>create_project</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <MinimalRebuild>true</MinimalRebuild> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <DisableLanguageExtensions>false</DisableLanguageExtensions> - <DisableSpecificWarnings>4003;4512;4127;4100;4244</DisableSpecificWarnings> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableLanguageExtensions>false</DisableLanguageExtensions> - <DisableSpecificWarnings>4003;4512;4127</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4003;4512;4127</DisableSpecificWarnings> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4003;4512;4127</DisableSpecificWarnings> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\cmake.cpp" /> - <ClCompile Include="..\codeblocks.cpp" /> - <ClCompile Include="..\create_project.cpp" /> - <ClCompile Include="..\msbuild.cpp" /> - <ClCompile Include="..\msvc.cpp" /> - <ClCompile Include="..\visualstudio.cpp" /> - <ClCompile Include="..\xcode.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\cmake.h" /> - <ClInclude Include="..\codeblocks.h" /> - <ClInclude Include="..\config.h" /> - <ClInclude Include="..\create_project.h" /> - <ClInclude Include="..\msbuild.h" /> - <ClInclude Include="..\msvc.h" /> - <ClInclude Include="..\visualstudio.h" /> - <ClInclude Include="..\xcode.h" /> - </ItemGroup> - <ItemGroup> - <None Include="..\scripts\installer.vbs" /> - <None Include="..\scripts\postbuild.cmd" /> - <None Include="..\scripts\prebuild.cmd" /> - <None Include="..\scripts\revision.vbs" /> - </ItemGroup> - <ItemGroup> - <Natvis Include="..\scripts\scummvm.natvis" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Header Files"> - <UniqueIdentifier>{2e3580c8-ec3a-4c81-8351-b668c668db2a}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files"> - <UniqueIdentifier>{31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6}</UniqueIdentifier> - </Filter> - <Filter Include="scripts"> - <UniqueIdentifier>{f980f6fb-41b6-4161-b035-58b200c85cad}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\codeblocks.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\create_project.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\msvc.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\msbuild.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\visualstudio.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\xcode.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\config.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\codeblocks.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\create_project.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\msvc.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\msbuild.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\visualstudio.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\xcode.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <None Include="..\scripts\prebuild.cmd"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\revision.vbs"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\postbuild.cmd"> - <Filter>scripts</Filter> - </None> - <None Include="..\scripts\installer.vbs"> - <Filter>scripts</Filter> - </None> - </ItemGroup> - <ItemGroup> - <Natvis Include="..\scripts\scummvm.natvis"> - <Filter>scripts</Filter> - </Natvis> - </ItemGroup> -</Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{CF177559-077D-4A08-AABE-BE0FD35F6C63}</ProjectGuid> - <RootNamespace>create_project</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v141</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <WholeProgramOptimization>true</WholeProgramOptimization> - <PlatformToolset>v141</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v141</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v141</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> - <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> - <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <DisableLanguageExtensions>false</DisableLanguageExtensions> - <DisableSpecificWarnings>4003;4512;4127;4100;4244</DisableSpecificWarnings> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <TargetMachine>MachineX86</TargetMachine> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level4</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableLanguageExtensions>false</DisableLanguageExtensions> - <DisableSpecificWarnings>4003;4512;4127</DisableSpecificWarnings> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4003;4512;4127</DisableSpecificWarnings> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <TargetMachine>MachineX86</TargetMachine> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <IntrinsicFunctions>true</IntrinsicFunctions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <FunctionLevelLinking>true</FunctionLevelLinking> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <DisableSpecificWarnings>4003;4512;4127</DisableSpecificWarnings> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <AdditionalDependencies>Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> - <GenerateDebugInformation>true</GenerateDebugInformation> - <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - </Link> - <PostBuildEvent> - <Command>@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\"</Command> - </PostBuildEvent> - <PreBuildEvent> - <Command> - </Command> - </PreBuildEvent> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\cmake.cpp" /> - <ClCompile Include="..\codeblocks.cpp" /> - <ClCompile Include="..\create_project.cpp" /> - <ClCompile Include="..\msbuild.cpp" /> - <ClCompile Include="..\msvc.cpp" /> - <ClCompile Include="..\visualstudio.cpp" /> - <ClCompile Include="..\xcode.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\cmake.h" /> - <ClInclude Include="..\codeblocks.h" /> - <ClInclude Include="..\config.h" /> - <ClInclude Include="..\create_project.h" /> - <ClInclude Include="..\msbuild.h" /> - <ClInclude Include="..\msvc.h" /> - <ClInclude Include="..\visualstudio.h" /> - <ClInclude Include="..\xcode.h" /> - </ItemGroup> - <ItemGroup> - <None Include="..\scripts\installer.vbs" /> - <None Include="..\scripts\postbuild.cmd" /> - <None Include="..\scripts\prebuild.cmd" /> - <None Include="..\scripts\revision.vbs" /> - </ItemGroup> - <ItemGroup> - <Natvis Include="..\scripts\scummvm.natvis" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file 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/msvc11/readme.txt b/dists/msvc/readme.txt index 45faac0663..e0da7f14c0 100644 --- a/dists/msvc11/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_msvc11.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/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/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 @@ -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 |