Skip to content

Commit 58b6bb1

Browse files
stanardstanard
committed
Updated project templates for MiniEngine's CreateNew scripts
1 parent 58fb026 commit 58b6bb1

File tree

8 files changed

+57
-75
lines changed

8 files changed

+57
-75
lines changed

‎MiniEngine/Tools/Scripts/CreateNewProject.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ def copy_app_template(project, guid):
3838
shutil.copy(os.path.join(TEMPLATES_FOLDER, 'pch.h'), project)
3939
shutil.copy(os.path.join(TEMPLATES_FOLDER, 'pch.cpp'), project)
4040
copy_template_file('Main.cpp', project, guid)
41-
copy_template_file('AppTemplate_VS15.sln', project, guid)
42-
copy_template_file('AppTemplate_VS15.vcxproj', project, guid)
43-
copy_template_file('AppTemplate_VS15.vcxproj.filters', project, guid)
41+
copy_template_file('AppTemplate.sln', project, guid)
42+
copy_template_file('AppTemplate.vcxproj', project, guid)
43+
copy_template_file('AppTemplate.vcxproj.filters', project, guid)
4444
for file in glob(os.path.join(TEMPLATES_FOLDER, '*.png')):
4545
shutil.copy(file, project)
4646

4747
def copy_lib_template(project, guid):
4848
'''Instantiates a new library project from a template'''
4949
shutil.copy(os.path.join(TEMPLATES_FOLDER, 'pch.h'), project)
5050
shutil.copy(os.path.join(TEMPLATES_FOLDER, 'pch.cpp'), project)
51-
copy_template_file('LibTemplate_VS15.vcxproj', project, guid)
52-
copy_template_file('LibTemplate_VS15.vcxproj.filters', project, guid)
51+
copy_template_file('LibTemplate.vcxproj', project, guid)
52+
copy_template_file('LibTemplate.vcxproj.filters', project, guid)
5353

5454
def create_project():
5555
if len(sys.argv) != 3 or sys.argv[1].lower() != 'app' and sys.argv[1].lower() != 'lib':

‎MiniEngine/Tools/Scripts/ProjectTemplates/AppTemplate_VS15.sln‎ renamed to ‎MiniEngine/Tools/Scripts/ProjectTemplates/AppTemplate.sln‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26403.7
3+
# Visual Studio 16
4+
VisualStudioVersion = 16
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TEMPLATE_NAME", "TEMPLATE_NAME_VS15.vcxproj", "{TEMPLATE_GUID}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TEMPLATE_NAME", "TEMPLATE_NAME.vcxproj", "{TEMPLATE_GUID}"
77
EndProject
8-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "..\Core\Core_VS15.vcxproj", "{86A58508-0D6A-4786-A32F-01A301FDC6F3}"
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "..\Core\Core.vcxproj", "{86A58508-0D6A-4786-A32F-01A301FDC6F3}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎MiniEngine/Tools/Scripts/ProjectTemplates/AppTemplate_VS15.vcxproj‎ renamed to ‎MiniEngine/Tools/Scripts/ProjectTemplates/AppTemplate.vcxproj‎

Lines changed: 29 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|x64">
55
<Configuration>Debug</Configuration>
@@ -15,65 +15,55 @@
1515
</ProjectConfiguration>
1616
</ItemGroup>
1717
<PropertyGroup Label="Globals">
18+
<RootNamespace>TEMPLATE_NAME</RootNamespace>
1819
<ProjectGuid>{TEMPLATE_GUID}</ProjectGuid>
19-
<ApplicationEnvironment>title</ApplicationEnvironment>
2020
<DefaultLanguage>en-US</DefaultLanguage>
2121
<Keyword>Win32Proj</Keyword>
2222
<ProjectName>TEMPLATE_NAME</ProjectName>
23-
<RootNamespace>TEMPLATE_NAME</RootNamespace>
24-
<PlatformToolset>v141</PlatformToolset>
25-
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
23+
<PlatformToolset>v142</PlatformToolset>
24+
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
2625
<TargetRuntime>Native</TargetRuntime>
27-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
2827
</PropertyGroup>
2928
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3029
<PropertyGroup Label="Configuration">
3130
<ConfigurationType>Application</ConfigurationType>
32-
<PlatformToolset>v141</PlatformToolset>
31+
<PlatformToolset>v142</PlatformToolset>
3332
<CharacterSet>Unicode</CharacterSet>
33+
<EmbedManifest>false</EmbedManifest>
3434
</PropertyGroup>
3535
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3636
<ImportGroup Label="ExtensionSettings" />
37-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
38-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39-
<Import Project="..\PropertySheets\VS15.props" />
40-
<Import Project="..\PropertySheets\Debug.props" />
41-
<Import Project="..\PropertySheets\Win32.props" />
42-
</ImportGroup>
43-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
37+
<ImportGroup Label="PropertySheets">
4438
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
45-
<Import Project="..\PropertySheets\VS15.props" />
46-
<Import Project="..\PropertySheets\Profile.props" />
47-
<Import Project="..\PropertySheets\Win32.props" />
48-
</ImportGroup>
49-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
50-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
51-
<Import Project="..\PropertySheets\VS15.props" />
52-
<Import Project="..\PropertySheets\Release.props" />
53-
<Import Project="..\PropertySheets\Win32.props" />
39+
<Import Project="..\PropertySheets\Build.props" />
40+
<Import Project="..\PropertySheets\Desktop.props" />
5441
</ImportGroup>
5542
<PropertyGroup Label="UserMacros" />
5643
<ItemDefinitionGroup>
5744
<ClCompile>
58-
<AdditionalIncludeDirectories>..\Core</AdditionalIncludeDirectories>
45+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
46+
<PrecompiledHeaderFile />
47+
<RuntimeTypeInfo>true</RuntimeTypeInfo>
48+
<AdditionalIncludeDirectories>..\Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
5949
</ClCompile>
60-
</ItemDefinitionGroup>
61-
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
62-
<Link>
63-
<AdditionalOptions>/nodefaultlib:MSVCRT %(AdditionalOptions)</AdditionalOptions>
64-
</Link>
65-
</ItemDefinitionGroup>
66-
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
6750
<Link>
51+
<AdditionalOptions Condition="'$(Configuration)'=='Debug'">/nodefaultlib:MSVCRT %(AdditionalOptions)</AdditionalOptions>
6852
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
6953
</AdditionalDependencies>
7054
</Link>
7155
</ItemDefinitionGroup>
56+
<ItemGroup>
57+
<ClInclude Include="pch.h" />
58+
</ItemGroup>
7259
<ItemGroup>
7360
<ClCompile Include="Main.cpp" />
61+
<ClCompile Include="pch.cpp">
62+
<PrecompiledHeader>Create</PrecompiledHeader>
63+
</ClCompile>
7464
</ItemGroup>
7565
<ItemGroup>
76-
<ProjectReference Include="../Core/Core_VS15.vcxproj">
66+
<ProjectReference Include="../Core/Core.vcxproj">
7767
<Project>{86A58508-0D6A-4786-A32F-01A301FDC6F3}</Project>
7868
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
7969
</ProjectReference>
@@ -85,23 +75,23 @@
8575
<Image Include="SplashScreen.png" />
8676
<Image Include="StoreLogo.png" />
8777
<Image Include="WideLogo.png" />
78+
<None Include="packages.config" />
8879
</ItemGroup>
8980
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9081
<ItemDefinitionGroup>
9182
<Link>
92-
<AdditionalLibraryDirectories>..\..\Packages\zlib-vc140-static-64.1.2.11\lib\native\libs\x64\static\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
93-
<AdditionalDependencies>zlibstatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
94-
<AdditionalOptions>/nodefaultlib:LIBCMT %(AdditionalOptions)</AdditionalOptions>
95-
</Link>
83+
<AdditionalLibraryDirectories>..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\lib_release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
84+
<AdditionalDependencies>zlibstatic.lib;%(AdditionalDependencies)</AdditionalDependencies>
85+
</Link>
9686
</ItemDefinitionGroup>
9787
<ImportGroup Label="ExtensionTargets">
98-
<Import Project="..\..\Packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" />
88+
<Import Project="..\..\Packages\WinPixEventRuntime.1.0.210209001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.210209001\build\WinPixEventRuntime.targets')" />
9989
</ImportGroup>
10090
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
10191
<PropertyGroup>
10292
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
10393
</PropertyGroup>
104-
<Error Condition="!Exists('..\..\Packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\WinPixEventRuntime.1.0.181206001\build\WinPixEventRuntime.targets'))" />
105-
<Error Condition="!Exists('..\..\Packages\zlib-vc140-static-64.1.2.11\build\native\zlib-vc140-static-64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\zlib-vc140-static-64.1.2.11\build\native\zlib-vc140-static-64.targets'))" />
94+
<Error Condition="!Exists('..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets'))" />
95+
<Error Condition="!Exists('..\..\Packages\WinPixEventRuntime.1.0.210209001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\WinPixEventRuntime.1.0.210209001\build\WinPixEventRuntime.targets'))" />
10696
</Target>
10797
</Project>

‎MiniEngine/Tools/Scripts/ProjectTemplates/AppTemplate_VS15.vcxproj.filters‎ renamed to ‎MiniEngine/Tools/Scripts/ProjectTemplates/AppTemplate.vcxproj.filters‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<ClCompile Include="Main.cpp">
1818
<Filter>Source Files</Filter>
1919
</ClCompile>
20+
<ClCompile Include="pch.cpp" />
21+
</ItemGroup>
22+
<ItemGroup>
23+
<ClInclude Include="pch.h" />
2024
</ItemGroup>
2125
<ItemGroup>
2226
<Image Include="Logo.png">

‎MiniEngine/Tools/Scripts/ProjectTemplates/LibTemplate_VS15.vcxproj‎ renamed to ‎MiniEngine/Tools/Scripts/ProjectTemplates/LibTemplate.vcxproj‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|x64">
55
<Configuration>Debug</Configuration>
@@ -20,35 +20,25 @@
2020
<ProjectName>TEMPLATE_NAME</ProjectName>
2121
<RootNamespace>TEMPLATE_NAME</RootNamespace>
2222
<DefaultLanguage>en-US</DefaultLanguage>
23-
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
24-
<ApplicationEnvironment>title</ApplicationEnvironment>
25-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
23+
<Keyword>Win32Proj</Keyword>
24+
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
25+
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
26+
<TargetRuntime>Native</TargetRuntime>
2627
</PropertyGroup>
2728
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2829
<PropertyGroup Label="Configuration">
2930
<ConfigurationType>StaticLibrary</ConfigurationType>
31+
<PlatformToolset>v142</PlatformToolset>
3032
<CharacterSet>Unicode</CharacterSet>
31-
<PlatformToolset>v141</PlatformToolset>
33+
<EmbedManifest>false</EmbedManifest>
34+
<GenerateManifest>false</GenerateManifest>
3235
</PropertyGroup>
3336
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3437
<ImportGroup Label="ExtensionSettings" />
35-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
36-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
37-
<Import Project="..\PropertySheets\VS15.props" />
38-
<Import Project="..\PropertySheets\Debug.props" />
39-
<Import Project="..\PropertySheets\Win32.props" />
40-
</ImportGroup>
41-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
42-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
43-
<Import Project="..\PropertySheets\VS15.props" />
44-
<Import Project="..\PropertySheets\Profile.props" />
45-
<Import Project="..\PropertySheets\Win32.props" />
46-
</ImportGroup>
47-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
48-
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
49-
<Import Project="..\PropertySheets\VS15.props" />
50-
<Import Project="..\PropertySheets\Release.props" />
51-
<Import Project="..\PropertySheets\Win32.props" />
38+
<ImportGroup Label="PropertySheets">
39+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
40+
<Import Project="..\PropertySheets\Build.props" />
41+
<Import Project="..\PropertySheets\Desktop.props" />
5242
</ImportGroup>
5343
<PropertyGroup Label="UserMacros" />
5444
<PropertyGroup />
@@ -58,8 +48,6 @@
5848
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
5949
<RuntimeTypeInfo>true</RuntimeTypeInfo>
6050
</ClCompile>
61-
</ItemDefinitionGroup>
62-
<ItemDefinitionGroup Condition="'$(Platform)'=='X64'">
6351
<Link>
6452
<AdditionalDependencies>d3d11.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
6553
<SubSystem>Windows</SubSystem>

‎MiniEngine/Tools/Scripts/ProjectTemplates/LibTemplate_VS15.vcxproj.filters‎ renamed to ‎MiniEngine/Tools/Scripts/ProjectTemplates/LibTemplate.vcxproj.filters‎

File renamed without changes.

‎MiniEngine/Tools/Scripts/ProjectTemplates/Main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void TEMPLATE_NAME::Cleanup( void )
4141
// Free up resources in an orderly fashion
4242
}
4343

44-
void TEMPLATE_NAME::Update( float deltaT )
44+
void TEMPLATE_NAME::Update( float /*deltaT*/ )
4545
{
4646
ScopedTimer _prof(L"Update State");
4747

‎MiniEngine/Tools/Scripts/ProjectTemplates/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="WinPixEventRuntime" version="1.0.180612001" targetFramework="native" />
4-
<package id="zlib-vc140-static-64" version="1.2.11" targetFramework="native" />
3+
<package id="WinPixEventRuntime" version="1.0.210209001" targetFramework="native" />
4+
<package id="zlib-msvc-x64" version="1.2.11.8900" targetFramework="native" />
55
</packages>

0 commit comments

Comments
 (0)