q3k
/
extremetuxracer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to Visual Studio 2017 

Reserve memory for some std::vectors to optimize their allocation behaviour

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@698 0420edf4-82e4-42fc-9478-35b55e6d67a3
master
pkeus 2017-08-27 14:37:42 +00:00
parent 7f020276c2
commit 4f1f702b7d
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/ETR.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.25914.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExtremeTuxRacer", "ExtremeTuxRacer.vcxproj", "{CA668921-360A-47CE-937D-4B5307FE9FEE}"
EndProject

10
build/ExtremeTuxRacer.vcxproj
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -26,21 +26,21 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140_xp</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseNativeEnvironment>true</UseNativeEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseNativeEnvironment>true</UseNativeEnvironment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140_xp</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<UseNativeEnvironment>true</UseNativeEnvironment>
@ -48,7 +48,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<UseNativeEnvironment>true</UseNativeEnvironment>

4
build/Installer.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
# Visual Studio 15
VisualStudioVersion = 15.0.25914.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{3B772885-4980-4A76-8407-4DABF8F7757C}"
EndProject

1
src/audio.cpp
View File

@ -171,6 +171,7 @@ void CMusic::LoadMusicList() {
// --- music ---
CSPList list;
if (list.Load(param.music_dir, "music.lst")) {
musics.reserve(list.size());
for (CSPList::const_iterator line = list.cbegin(); line != list.cend(); ++line) {
std::string name = SPStrN(*line, "name");
std::string musicfile = SPStrN(*line, "file");

1
src/font.cpp
View File

@ -133,6 +133,7 @@ bool CFont::LoadFontlist() {
return false;
}
fonts.reserve(list.size());
for (CSPList::const_iterator line = list.cbegin(); line != list.cend(); ++line) {
std::string fontfile = SPStrN(*line, "file");
std::string name = SPStrN(*line, "name");

1
src/game_ctrl.cpp
View File

@ -246,6 +246,7 @@ bool CPlayers::LoadAvatars() {
return false;
}
avatars.reserve(list.size());
for (CSPList::const_iterator line = list.cbegin(); line != list.cend(); ++line) {
std::string filename = SPStrN(*line, "file", "unknown");
TTexture* texture = new TTexture();

2
src/particles.cpp
View File

@ -607,6 +607,7 @@ void CFlakes::UpdateAreas(const CControl *ctrl) {
void CFlakes::Init(int grade, const CControl *ctrl) {
Reset();
areas.reserve(3);
switch (grade) {
case 1:
// areas.emplace_back(400, 5, 4, 4, -2, 4, 0.01, 0.02, 5, true);
@ -864,6 +865,7 @@ void CCurtain::SetStartParams(const CControl *ctrl) {
void CCurtain::Init(const CControl *ctrl) {
Reset();
InitChanges();
curtains.reserve(3);
switch (g_game.snow_id) {
case 1:
// curtains.emplace_back(3, 60, 10, 3, -100, -10, 1);