Skip to content

Commit

Permalink
fixed building with VS13 (you just need to update the PlatformToolset…
Browse files Browse the repository at this point in the history
… to v120) + better gitignore
  • Loading branch information
mrexodia committed Dec 17, 2015
1 parent 929e983 commit be7d1ad
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
7 changes: 6 additions & 1 deletion .gitignore
@@ -1,7 +1,12 @@
procrastitracker/Release
procrastitracker/Debug
PT/procrastitracker.exe
ipch/
*.pdb
*.ncb
*.iobj
*.ipdb

*.suo
*.sdf
*.opensdf
*.aps
10 changes: 5 additions & 5 deletions procrastitracker/procrastitracker.vcxproj
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?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">
Expand Down Expand Up @@ -42,12 +42,12 @@
<_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)..\PT\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<OutDir>$(SolutionDir)..\PT\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
Expand All @@ -65,7 +65,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>Psapi.lib;comctl32.lib;Comdlg32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\PT\$(ProjectName).exe</OutputFile>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(TargetName)_dbg.pdb</ProgramDatabaseFile>
Expand All @@ -86,7 +86,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>Psapi.lib;comctl32.lib;Comdlg32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\PT\$(ProjectName).exe</OutputFile>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand Down
2 changes: 1 addition & 1 deletion src/nodedb.h
Expand Up @@ -71,7 +71,7 @@ void load(node *root, char *fn, bool merge)
if (merge) // don't overwrite global data
{
int ntags = rint(f);
uint bytes = ntags * (sizeof(tag::name) + sizeof(int)); // tags
uint bytes = ntags * (sizeof(tag().name) + sizeof(int)); // tags
bytes += version < 6 ? 10 : sizeof(int); // minfilter
bytes += sizeof(int); // foldlevel
if (version >= 6) // prefs
Expand Down

0 comments on commit be7d1ad

Please sign in to comment.