Skip to content

Commit 84f4d05

Browse files
ForserXForserX
committed
* ADD: Added commit hash and current branch to log.
1 parent 9eea080 commit 84f4d05

File tree

11 files changed

+171
-5
lines changed

11 files changed

+171
-5
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ game/gamedata/configs/coordinates.ltx
4848

4949
*.vspx
5050
/intermediateWin32/nvtt/Release/*.res
51+
code/engine.vc2008/xrCore/GitParser/GitParser.exe
52+
code/engine.vc2008/xrCore/oxy_version.h

‎code/engine.vc2008/xrCore/GitParser/GitParser.cpp

4.08 KB
Binary file not shown.

‎code/engine.vc2008/xrCore/GitParser/GitParser.vcxproj

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|x64">
5+
<Configuration>Debug</Configuration>
6+
<Platform>x64</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|x64">
9+
<Configuration>Release</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<VCProjectVersion>15.0</VCProjectVersion>
15+
<ProjectGuid>{76485157-3A23-47E9-8A5E-5B190F91511C}</ProjectGuid>
16+
<Keyword>Win32Proj</Keyword>
17+
<RootNamespace>GitParser</RootNamespace>
18+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
19+
</PropertyGroup>
20+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
22+
<ConfigurationType>Application</ConfigurationType>
23+
<UseDebugLibraries>true</UseDebugLibraries>
24+
<PlatformToolset>v141</PlatformToolset>
25+
<CharacterSet>Unicode</CharacterSet>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
28+
<ConfigurationType>Application</ConfigurationType>
29+
<UseDebugLibraries>false</UseDebugLibraries>
30+
<PlatformToolset>v141</PlatformToolset>
31+
<WholeProgramOptimization>true</WholeProgramOptimization>
32+
<CharacterSet>Unicode</CharacterSet>
33+
</PropertyGroup>
34+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
35+
<ImportGroup Label="ExtensionSettings">
36+
</ImportGroup>
37+
<ImportGroup Label="Shared">
38+
</ImportGroup>
39+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
40+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
41+
<Import Project="..\..\..\F-Ray.props" />
42+
</ImportGroup>
43+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
44+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
45+
<Import Project="..\..\..\F-Ray.props" />
46+
</ImportGroup>
47+
<PropertyGroup Label="UserMacros" />
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
49+
<LinkIncremental>false</LinkIncremental>
50+
<OutDir>.\</OutDir>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
53+
<LinkIncremental>true</LinkIncremental>
54+
<OutDir>.\</OutDir>
55+
</PropertyGroup>
56+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
57+
<ClCompile>
58+
<PrecompiledHeader>Use</PrecompiledHeader>
59+
<WarningLevel>Level3</WarningLevel>
60+
<Optimization>MaxSpeed</Optimization>
61+
<FunctionLevelLinking>true</FunctionLevelLinking>
62+
<IntrinsicFunctions>true</IntrinsicFunctions>
63+
<SDLCheck>true</SDLCheck>
64+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
65+
<ConformanceMode>true</ConformanceMode>
66+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
67+
</ClCompile>
68+
<Link>
69+
<SubSystem>Console</SubSystem>
70+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
71+
<OptimizeReferences>true</OptimizeReferences>
72+
<GenerateDebugInformation>true</GenerateDebugInformation>
73+
</Link>
74+
</ItemDefinitionGroup>
75+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
76+
<ClCompile>
77+
<PrecompiledHeader>Use</PrecompiledHeader>
78+
<WarningLevel>Level3</WarningLevel>
79+
<Optimization>Disabled</Optimization>
80+
<SDLCheck>true</SDLCheck>
81+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
82+
<ConformanceMode>true</ConformanceMode>
83+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
84+
</ClCompile>
85+
<Link>
86+
<SubSystem>Console</SubSystem>
87+
<GenerateDebugInformation>true</GenerateDebugInformation>
88+
</Link>
89+
</ItemDefinitionGroup>
90+
<ItemGroup>
91+
<ClInclude Include="stdafx.h" />
92+
<ClInclude Include="targetver.h" />
93+
</ItemGroup>
94+
<ItemGroup>
95+
<ClCompile Include="GitParser.cpp" />
96+
<ClCompile Include="stdafx.cpp">
97+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
98+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
99+
</ClCompile>
100+
</ItemGroup>
101+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
102+
<ImportGroup Label="ExtensionTargets">
103+
</ImportGroup>
104+
</Project>

‎code/engine.vc2008/xrCore/GitParser/GitParser.vcxproj.filters

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Исходные файлы">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Файлы заголовков">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
11+
</Filter>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ClInclude Include="stdafx.h">
15+
<Filter>Файлы заголовков</Filter>
16+
</ClInclude>
17+
<ClInclude Include="targetver.h">
18+
<Filter>Файлы заголовков</Filter>
19+
</ClInclude>
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ClCompile Include="stdafx.cpp">
23+
<Filter>Исходные файлы</Filter>
24+
</ClCompile>
25+
<ClCompile Include="GitParser.cpp">
26+
<Filter>Исходные файлы</Filter>
27+
</ClCompile>
28+
</ItemGroup>
29+
</Project>

‎code/engine.vc2008/xrCore/GitParser/stdafx.cpp

766 Bytes
Binary file not shown.

‎code/engine.vc2008/xrCore/GitParser/stdafx.h

728 Bytes
Binary file not shown.

‎code/engine.vc2008/xrCore/GitParser/targetver.h

686 Bytes
Binary file not shown.

‎code/engine.vc2008/xrCore/xrCore.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
//
33
#include "stdafx.h"
44
#pragma hdrstop
5-
65
#include <mmsystem.h>
76
#include <objbase.h>
87
#include "../FrayBuildConfig.hpp"
8+
#include "oxy_version.h"
99
#pragma comment(lib,"winmm.lib")
1010

1111
#ifdef DEBUG
@@ -20,7 +20,7 @@ XRCORE_API const char* build_date;
2020
XRCORE_API bool gModulesLoaded = false;
2121

2222

23-
static u32 init_counter = 0;
23+
static u32 init_counter = 0;
2424
void compute_build_id();
2525

2626
#include "DateTime.hpp"
@@ -90,6 +90,7 @@ void xrCore::_initialize(const char* _ApplicationName, LogCallback cb, BOOL init
9090

9191
compute_build_id();
9292
Msg("xrCore build %d, %s\n", build_id, build_date);
93+
Msg("xrOxygen Version: branch[%s], commit[%s]", _BRANCH, _HASH);
9394

9495
EFS._initialize();
9596
}

‎code/engine.vc2008/xrCore/xrCore.vcxproj

+16
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@
128128
<ImportLibrary>$(xrLib)$(TargetName).lib</ImportLibrary>
129129
<AdditionalDependencies>dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
130130
</Link>
131+
<PreBuildEvent>
132+
<Command>echo parsing git...
133+
start GitParser\GitParser.exe</Command>
134+
</PreBuildEvent>
131135
</ItemDefinitionGroup>
132136
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
133137
<ClCompile>
@@ -180,6 +184,10 @@
180184
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
181185
<ImportLibrary>$(xrLib)$(TargetName).lib</ImportLibrary>
182186
</Link>
187+
<PreBuildEvent>
188+
<Command>echo parsing git...
189+
start GitParser\GitParser.exe</Command>
190+
</PreBuildEvent>
183191
</ItemDefinitionGroup>
184192
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
185193
<ClCompile>
@@ -232,6 +240,10 @@
232240
<AdditionalLibraryDirectories>$(xrLib)..\Release\;</AdditionalLibraryDirectories>
233241
<ImportLibrary>$(xrLib)..\Release\$(TargetName).lib</ImportLibrary>
234242
</Link>
243+
<PreBuildEvent>
244+
<Command>echo parsing git...
245+
start GitParser\GitParser.exe</Command>
246+
</PreBuildEvent>
235247
</ItemDefinitionGroup>
236248
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_IA32|x64'">
237249
<ClCompile>
@@ -285,6 +297,10 @@
285297
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
286298
<ImportLibrary>$(xrLib)$(TargetName).lib</ImportLibrary>
287299
</Link>
300+
<PreBuildEvent>
301+
<Command>echo parsing git...
302+
start GitParser\GitParser.exe</Command>
303+
</PreBuildEvent>
288304
</ItemDefinitionGroup>
289305
<ItemGroup>
290306
<ClCompile Include="..\xrEngine\interp.cpp" />

‎code/engine.vc2008/xrScripts/BuildVm/BuildVm.vcxproj

-3
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,18 @@
6262
<PropertyGroup Label="UserMacros" />
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
6464
<LinkIncremental>false</LinkIncremental>
65-
<IntDir>$(xrIntermediate)</IntDir>
6665
<OutDir>..\</OutDir>
6766
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
6867
<PreLinkEventUseInBuild>false</PreLinkEventUseInBuild>
6968
</PropertyGroup>
7069
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_IA32|x64'">
7170
<LinkIncremental>false</LinkIncremental>
72-
<IntDir>$(xrIntermediate)</IntDir>
7371
<OutDir>..\</OutDir>
7472
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
7573
<PreLinkEventUseInBuild>false</PreLinkEventUseInBuild>
7674
</PropertyGroup>
7775
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7876
<LinkIncremental>true</LinkIncremental>
79-
<IntDir>$(xrIntermediate)</IntDir>
8077
<OutDir>..\</OutDir>
8178
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
8279
<PreLinkEventUseInBuild>false</PreLinkEventUseInBuild>

‎code/xrEngine.sln

+17
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrCDB", "engine.vc2008\xrCD
88
EndProjectSection
99
EndProject
1010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrCore", "engine.vc2008\xrCore\xrCore.vcxproj", "{A0F7D1FB-59A7-4717-A7E4-96F37E91998E}"
11+
ProjectSection(ProjectDependencies) = postProject
12+
{76485157-3A23-47E9-8A5E-5B190F91511C} = {76485157-3A23-47E9-8A5E-5B190F91511C}
13+
EndProjectSection
1114
EndProject
1215
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrGame", "engine.vc2008\xrGame\xrGame.vcxproj", "{200652A6-043E-4634-8837-87983B3BD5E0}"
1316
ProjectSection(ProjectDependencies) = postProject
@@ -76,6 +79,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OPCODE", "3rd-party\OPCODE\
7679
EndProject
7780
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "min_obb", "3rd-party\min_obb\min_obb.vcxproj", "{D1317D51-2172-46BB-898C-CD2363DD8171}"
7881
EndProject
82+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pre-build tools", "pre-build tools", "{AEBB1563-4C98-4389-BD7C-09FBB6012CBE}"
83+
EndProject
84+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GitParser", "engine.vc2008\xrCore\GitParser\GitParser.vcxproj", "{76485157-3A23-47E9-8A5E-5B190F91511C}"
85+
EndProject
7986
Global
8087
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8188
Debug|x64 = Debug|x64
@@ -230,16 +237,26 @@ Global
230237
{D1317D51-2172-46BB-898C-CD2363DD8171}.Release_IA32|x64.Build.0 = Release|x64
231238
{D1317D51-2172-46BB-898C-CD2363DD8171}.Release|x64.ActiveCfg = Release|x64
232239
{D1317D51-2172-46BB-898C-CD2363DD8171}.Release|x64.Build.0 = Release|x64
240+
{76485157-3A23-47E9-8A5E-5B190F91511C}.Debug|x64.ActiveCfg = Debug|x64
241+
{76485157-3A23-47E9-8A5E-5B190F91511C}.Debug|x64.Build.0 = Debug|x64
242+
{76485157-3A23-47E9-8A5E-5B190F91511C}.Mixed|x64.ActiveCfg = Release|x64
243+
{76485157-3A23-47E9-8A5E-5B190F91511C}.Mixed|x64.Build.0 = Release|x64
244+
{76485157-3A23-47E9-8A5E-5B190F91511C}.Release_IA32|x64.ActiveCfg = Release|x64
245+
{76485157-3A23-47E9-8A5E-5B190F91511C}.Release_IA32|x64.Build.0 = Release|x64
246+
{76485157-3A23-47E9-8A5E-5B190F91511C}.Release|x64.ActiveCfg = Release|x64
247+
{76485157-3A23-47E9-8A5E-5B190F91511C}.Release|x64.Build.0 = Release|x64
233248
EndGlobalSection
234249
GlobalSection(SolutionProperties) = preSolution
235250
HideSolutionNode = FALSE
236251
EndGlobalSection
237252
GlobalSection(NestedProjects) = preSolution
238253
{9E14D7B5-9D0E-4373-B076-33DD4BECDBA0} = {9A6A94C9-26FC-450C-986F-AA512F84C030}
254+
{9E14D7B5-9D0E-4373-B076-33DD4BECDBA0} = {AEBB1563-4C98-4389-BD7C-09FBB6012CBE}
239255
{1BF75FEB-87DD-486C-880B-227987D191C2} = {9A6A94C9-26FC-450C-986F-AA512F84C030}
240256
{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {9A6A94C9-26FC-450C-986F-AA512F84C030}
241257
{AE0574E2-BE4C-49B0-98A6-739176D69277} = {9A6A94C9-26FC-450C-986F-AA512F84C030}
242258
{D1317D51-2172-46BB-898C-CD2363DD8171} = {9A6A94C9-26FC-450C-986F-AA512F84C030}
259+
{76485157-3A23-47E9-8A5E-5B190F91511C} = {AEBB1563-4C98-4389-BD7C-09FBB6012CBE}
243260
EndGlobalSection
244261
GlobalSection(ExtensibilityGlobals) = postSolution
245262
SolutionGuid = {DC8D3737-61A4-4A70-AE4C-C66D5F07767A}

0 commit comments

Comments
 (0)