Skip to content

Commit 581795e

Browse files
asfernandesasfernandes
committed
Merge branch 'work/profiler-plugin' into work/profiler-plugin-merge
2 parents 8e641c4 + 2f2f5fe commit 581795e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+6026
-474
lines changed

‎builds/install/misc/firebird.conf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,12 @@
507507
#
508508
#UserManager = Srp
509509

510+
# Default profiler plugin used to profile connections using the RDB$PROFILER package.
511+
#
512+
# Per-database configurable.
513+
#
514+
#DefaultProfilerPlugin = Default_Profiler
515+
510516
# TracePlugin is used by firebird trace facility to send trace data to the user
511517
# or log file in audit case.
512518
#

‎builds/posix/Makefile.in‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ $(NBACKUP): $(NBACKUP_Objects) $(COMMON_LIB)
548548
# plugins - some of them are required to build examples, use separate entry for them
549549
#
550550

551-
.PHONY: udr legacy_user_management legacy_auth_server trace auth_debug udf_compat chacha
551+
.PHONY: udr legacy_user_management legacy_auth_server trace auth_debug udf_compat chacha profiler
552552
UDR_PLUGIN = $(call makePluginName,udr_engine)
553553
LEGACY_USER_MANAGER = $(call makePluginName,Legacy_UserManager)
554554
LEGACY_AUTH_SERVER = $(call makePluginName,Legacy_Auth)
@@ -558,13 +558,14 @@ AUTH_DEBUGGER = $(call makePluginName,Auth_Debug)
558558
UDF_BACKWARD_COMPATIBILITY_BASENAME = $(LIB_PREFIX)udf_compat.$(SHRLIB_EXT)
559559
UDF_BACKWARD_COMPATIBILITY = $(PLUGINS)/udr/$(UDF_BACKWARD_COMPATIBILITY_BASENAME)
560560
CHACHA = $(call makePluginName,ChaCha)
561+
PROFILER = $(call makePluginName,Default_Profiler)
561562

562563
BUILD_DEBUG:=
563564
ifeq ($(TARGET),Debug)
564565
BUILD_DEBUG:=auth_debug
565566
endif
566567

567-
plugins: udr legacy_user_management legacy_auth_server srp_user_management trace $(BUILD_DEBUG) udf_compat chacha
568+
plugins: udr legacy_user_management legacy_auth_server srp_user_management trace $(BUILD_DEBUG) udf_compat chacha profiler
568569

569570
udr: $(UDR_PLUGIN) $(PLUGINS)/udr_engine.conf
570571

@@ -593,6 +594,12 @@ $(LEGACY_AUTH_SERVER): $(LEGACY_AUTH_SERVER_Objects) $(COMMON_LIB)
593594
$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
594595
$(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libLegacy_Auth.$(SHRLIB_EXT))
595596

597+
profiler: $(PROFILER)
598+
599+
$(PROFILER): $(Profiler_Objects) $(COMMON_LIB)
600+
$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
601+
$(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libDefault_Profiler.$(SHRLIB_EXT))
602+
596603
trace: $(FBTRACE)
597604

598605
$(FBTRACE): $(FBTRACE_UTIL_Objects) $(COMMON_LIB)

‎builds/posix/make.shared.variables‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,12 @@ AllObjects += $(Remote_Common) $(Remote_Server) $(Remote_Client)
7979

8080
# Chacha plugin
8181
Chacha_Objects:= $(call dirObjects,plugins/crypt/chacha)
82-
8382
AllObjects += $(Chacha_Objects)
8483

84+
# Profiler plugin
85+
Profiler_Objects:= $(call dirObjects,plugins/profiler)
86+
AllObjects += $(Profiler_Objects)
87+
8588
# Engine
8689
Engine_Objects:= $(call dirObjects,jrd) $(call dirObjects,dsql) $(call dirObjects,jrd/extds) \
8790
$(call dirObjects,jrd/optimizer) $(call dirObjects,jrd/recsrc) $(call dirObjects,jrd/replication) $(call dirObjects,jrd/trace) \

‎builds/win32/msvc15/Firebird.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chacha", "chacha.vcxproj",
8484
EndProject
8585
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_static", "engine_static.vcxproj", "{B32D1B09-8161-451E-8D20-D30F26094EC0}"
8686
EndProject
87+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_profiler", "default_profiler.vcxproj", "{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}"
88+
EndProject
8789
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LIBs", "LIBs", "{DA5015E4-8349-4DAB-A1E5-18BDBDDA3022}"
8890
EndProject
8991
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EXEs", "EXEs", "{3E6F3FA4-225F-4591-A466-05FDBEF56DBF}"
@@ -390,6 +392,14 @@ Global
390392
{3314D6AD-554F-4AE1-B297-6D2D6207DD7C}.Release|Win32.Build.0 = Release|Win32
391393
{3314D6AD-554F-4AE1-B297-6D2D6207DD7C}.Release|x64.ActiveCfg = Release|x64
392394
{3314D6AD-554F-4AE1-B297-6D2D6207DD7C}.Release|x64.Build.0 = Release|x64
395+
{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}.Debug|Win32.ActiveCfg = Debug|Win32
396+
{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}.Debug|Win32.Build.0 = Debug|Win32
397+
{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}.Debug|x64.ActiveCfg = Debug|x64
398+
{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}.Debug|x64.Build.0 = Debug|x64
399+
{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}.Release|Win32.ActiveCfg = Release|Win32
400+
{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}.Release|Win32.Build.0 = Release|Win32
401+
{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}.Release|x64.ActiveCfg = Release|x64
402+
{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}.Release|x64.Build.0 = Release|x64
393403
EndGlobalSection
394404
GlobalSection(SolutionProperties) = preSolution
395405
HideSolutionNode = FALSE

‎builds/win32/msvc15/default_profiler.filters‎

Lines changed: 29 additions & 0 deletions
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="Source files">
5+
<UniqueIdentifier>{3ce83b57-8830-4673-8c73-0b1e607fe2e7}</UniqueIdentifier>
6+
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
7+
</Filter>
8+
<Filter Include="Header files">
9+
<UniqueIdentifier>{5a3fd64b-6882-4e1d-b7ac-83fb12f1c8e8}</UniqueIdentifier>
10+
<Extensions>h;hpp;hxx;hm;inl</Extensions>
11+
</Filter>
12+
<Filter Include="Resource files">
13+
<UniqueIdentifier>{e5b5aa94-df00-43cf-ac73-248edd148f20}</UniqueIdentifier>
14+
</Filter>
15+
</ItemGroup>
16+
<ItemGroup>
17+
<ClCompile Include="..\..\..\src\plugins\profiler\Profiler.cpp">
18+
<Filter>Source files</Filter>
19+
</ClCompile>
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
23+
<Filter>Resource files</Filter>
24+
</ResourceCompile>
25+
</ItemGroup>
26+
<ItemGroup>
27+
<None Include="..\defs\plugin.def" />
28+
</ItemGroup>
29+
</Project>

‎builds/win32/msvc15/default_profiler.vcxproj‎

Lines changed: 230 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,230 @@
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|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{9821F2C0-4EC1-4ACB-BF32-DEB4C21032DE}</ProjectGuid>
23+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='15.0'">10.0.17763.0</WindowsTargetPlatformVersion>
24+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='16.0'">10.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='17.0'">10.0</WindowsTargetPlatformVersion>
26+
</PropertyGroup>
27+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
29+
<ConfigurationType>DynamicLibrary</ConfigurationType>
30+
<UseOfMfc>false</UseOfMfc>
31+
<CharacterSet>MultiByte</CharacterSet>
32+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141_xp</PlatformToolset>
33+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
34+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='17.0'">v143</PlatformToolset>
35+
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
37+
<ConfigurationType>DynamicLibrary</ConfigurationType>
38+
<UseOfMfc>false</UseOfMfc>
39+
<CharacterSet>MultiByte</CharacterSet>
40+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141_xp</PlatformToolset>
41+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
42+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='17.0'">v143</PlatformToolset>
43+
</PropertyGroup>
44+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
45+
<ConfigurationType>DynamicLibrary</ConfigurationType>
46+
<UseOfMfc>false</UseOfMfc>
47+
<CharacterSet>MultiByte</CharacterSet>
48+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
49+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
50+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='17.0'">v143</PlatformToolset>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
53+
<ConfigurationType>DynamicLibrary</ConfigurationType>
54+
<UseOfMfc>false</UseOfMfc>
55+
<CharacterSet>MultiByte</CharacterSet>
56+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
57+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16.0'">v142</PlatformToolset>
58+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='17.0'">v143</PlatformToolset>
59+
</PropertyGroup>
60+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
61+
<ImportGroup Label="ExtensionSettings">
62+
</ImportGroup>
63+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
64+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
66+
<Import Project="FirebirdCommon.props" />
67+
<Import Project="FirebirdRelease.props" />
68+
<Import Project="DllNoEmbedManifest.props" />
69+
</ImportGroup>
70+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
71+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
72+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
73+
<Import Project="FirebirdCommon.props" />
74+
<Import Project="FirebirdDebug.props" />
75+
<Import Project="DllNoEmbedManifest.props" />
76+
</ImportGroup>
77+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
78+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
79+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
80+
<Import Project="FirebirdCommon.props" />
81+
<Import Project="FirebirdRelease.props" />
82+
<Import Project="DllNoEmbedManifest.props" />
83+
</ImportGroup>
84+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
85+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
86+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
87+
<Import Project="FirebirdCommon.props" />
88+
<Import Project="FirebirdDebug.props" />
89+
<Import Project="DllNoEmbedManifest.props" />
90+
</ImportGroup>
91+
<PropertyGroup Label="UserMacros" />
92+
<PropertyGroup>
93+
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
94+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
95+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
96+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
97+
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
98+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
99+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
100+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
101+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
102+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
103+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
104+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
105+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
106+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
107+
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
108+
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
109+
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
110+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
111+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
112+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
113+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
114+
</PropertyGroup>
115+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
116+
<Midl>
117+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118+
<MkTypLibCompatible>true</MkTypLibCompatible>
119+
<TargetEnvironment>Win32</TargetEnvironment>
120+
</Midl>
121+
<ClCompile>
122+
<Optimization>Disabled</Optimization>
123+
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
125+
</ClCompile>
126+
<Link>
127+
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
128+
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\$(ProjectName).dll</OutputFile>
129+
<ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile>
130+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
131+
<DataExecutionPrevention>
132+
</DataExecutionPrevention>
133+
<SubSystem>Windows</SubSystem>
134+
</Link>
135+
</ItemDefinitionGroup>
136+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
137+
<Midl>
138+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
139+
<MkTypLibCompatible>true</MkTypLibCompatible>
140+
<TargetEnvironment>X64</TargetEnvironment>
141+
</Midl>
142+
<ClCompile>
143+
<Optimization>Disabled</Optimization>
144+
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;DEV_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145+
</ClCompile>
146+
<Link>
147+
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
148+
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\$(ProjectName).dll</OutputFile>
149+
<ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile>
150+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
151+
<DataExecutionPrevention>
152+
</DataExecutionPrevention>
153+
<TargetMachine>MachineX64</TargetMachine>
154+
<SubSystem>Windows</SubSystem>
155+
</Link>
156+
</ItemDefinitionGroup>
157+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
158+
<Midl>
159+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160+
<MkTypLibCompatible>true</MkTypLibCompatible>
161+
<TargetEnvironment>Win32</TargetEnvironment>
162+
</Midl>
163+
<ClCompile>
164+
<Optimization>MaxSpeed</Optimization>
165+
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
166+
<IntrinsicFunctions>true</IntrinsicFunctions>
167+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
168+
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
169+
</ClCompile>
170+
<Link>
171+
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
172+
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\$(ProjectName).dll</OutputFile>
173+
<ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile>
174+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
175+
<DataExecutionPrevention>
176+
</DataExecutionPrevention>
177+
<SubSystem>Windows</SubSystem>
178+
</Link>
179+
</ItemDefinitionGroup>
180+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
181+
<Midl>
182+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
183+
<MkTypLibCompatible>true</MkTypLibCompatible>
184+
<TargetEnvironment>X64</TargetEnvironment>
185+
</Midl>
186+
<ClCompile>
187+
<Optimization>MaxSpeed</Optimization>
188+
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
189+
<IntrinsicFunctions>true</IntrinsicFunctions>
190+
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
191+
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WINDOWS_ONLY;SUPERCLIENT;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
192+
</ClCompile>
193+
<Link>
194+
<AdditionalDependencies>comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
195+
<OutputFile>..\..\..\temp\$(Platform)\$(Configuration)\firebird\plugins\$(ProjectName).dll</OutputFile>
196+
<ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile>
197+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
198+
<DataExecutionPrevention>
199+
</DataExecutionPrevention>
200+
<TargetMachine>MachineX64</TargetMachine>
201+
<SubSystem>Windows</SubSystem>
202+
</Link>
203+
</ItemDefinitionGroup>
204+
<ItemGroup>
205+
<ClCompile Include="..\..\..\src\plugins\profiler\Profiler.cpp" />
206+
</ItemGroup>
207+
<ItemGroup>
208+
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
209+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\src\jrd</AdditionalIncludeDirectories>
210+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\src\jrd</AdditionalIncludeDirectories>
211+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\src\jrd</AdditionalIncludeDirectories>
212+
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\src\jrd</AdditionalIncludeDirectories>
213+
</ResourceCompile>
214+
</ItemGroup>
215+
<ItemGroup>
216+
<None Include="..\defs\plugin.def" />
217+
</ItemGroup>
218+
<ItemGroup>
219+
<ProjectReference Include="common.vcxproj">
220+
<Project>{15605f44-bffd-444f-ad4c-55dc9d704465}</Project>
221+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
222+
</ProjectReference>
223+
<ProjectReference Include="yvalve.vcxproj">
224+
<Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project>
225+
</ProjectReference>
226+
</ItemGroup>
227+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
228+
<ImportGroup Label="ExtensionTargets">
229+
</ImportGroup>
230+
</Project>

‎builds/win32/msvc15/engine.vcxproj.filters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
<Filter>Resource files</Filter>
1414
</ResourceCompile>
1515
</ItemGroup>
16-
</Project>
16+
</Project>

0 commit comments

Comments
 (0)