Skip to content

Commit ba29113

Browse files
committed
Update MSVC project files.
1 parent aae8fd9 commit ba29113

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

msvc/projects/vc2015/jemalloc/jemalloc.vcxproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
</ItemGroup>
3737
<ItemGroup>
3838
<ClCompile Include="..\..\..\..\src\arena.c" />
39+
<ClCompile Include="..\..\..\..\src\background_thread.c" />
3940
<ClCompile Include="..\..\..\..\src\base.c" />
4041
<ClCompile Include="..\..\..\..\src\bitmap.c" />
4142
<ClCompile Include="..\..\..\..\src\ckh.c" />
@@ -49,13 +50,15 @@
4950
<ClCompile Include="..\..\..\..\src\large.c" />
5051
<ClCompile Include="..\..\..\..\src\malloc_io.c" />
5152
<ClCompile Include="..\..\..\..\src\mutex.c" />
53+
<ClCompile Include="..\..\..\..\src\mutex_pool.c" />
5254
<ClCompile Include="..\..\..\..\src\nstime.c" />
5355
<ClCompile Include="..\..\..\..\src\pages.c" />
5456
<ClCompile Include="..\..\..\..\src\prng.c" />
5557
<ClCompile Include="..\..\..\..\src\prof.c" />
5658
<ClCompile Include="..\..\..\..\src\rtree.c" />
5759
<ClCompile Include="..\..\..\..\src\spin.c" />
5860
<ClCompile Include="..\..\..\..\src\stats.c" />
61+
<ClCompile Include="..\..\..\..\src\sz.c" />
5962
<ClCompile Include="..\..\..\..\src\tcache.c" />
6063
<ClCompile Include="..\..\..\..\src\ticker.c" />
6164
<ClCompile Include="..\..\..\..\src\tsd.c" />
@@ -227,7 +230,7 @@
227230
</PrecompiledHeader>
228231
<WarningLevel>Level3</WarningLevel>
229232
<Optimization>Disabled</Optimization>
230-
<PreprocessorDefinitions>_REENTRANT;_WINDLL;DLLEXPORT;JEMALLOC_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
233+
<PreprocessorDefinitions>JEMALLOC_NO_PRIVATE_NAMESPACE;_REENTRANT;_WINDLL;DLLEXPORT;JEMALLOC_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
231234
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
232235
<DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings>
233236
<ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -243,7 +246,7 @@
243246
</PrecompiledHeader>
244247
<WarningLevel>Level3</WarningLevel>
245248
<Optimization>Disabled</Optimization>
246-
<PreprocessorDefinitions>JEMALLOC_DEBUG;_REENTRANT;JEMALLOC_EXPORT=;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
249+
<PreprocessorDefinitions>JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_DEBUG;_REENTRANT;JEMALLOC_EXPORT=;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
247250
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
248251
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
249252
<DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings>
@@ -305,7 +308,7 @@
305308
<FunctionLevelLinking>true</FunctionLevelLinking>
306309
<IntrinsicFunctions>true</IntrinsicFunctions>
307310
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
308-
<PreprocessorDefinitions>_REENTRANT;_WINDLL;DLLEXPORT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
311+
<PreprocessorDefinitions>JEMALLOC_NO_PRIVATE_NAMESPACE;_REENTRANT;_WINDLL;DLLEXPORT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
309312
<DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings>
310313
<ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName>
311314
</ClCompile>
@@ -324,7 +327,7 @@
324327
<Optimization>MaxSpeed</Optimization>
325328
<FunctionLevelLinking>true</FunctionLevelLinking>
326329
<IntrinsicFunctions>true</IntrinsicFunctions>
327-
<PreprocessorDefinitions>_REENTRANT;JEMALLOC_EXPORT=;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
330+
<PreprocessorDefinitions>JEMALLOC_NO_PRIVATE_NAMESPACE;_REENTRANT;JEMALLOC_EXPORT=;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
328331
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
329332
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
330333
<DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings>

msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<ClCompile Include="..\..\..\..\src\arena.c">
1111
<Filter>Source Files</Filter>
1212
</ClCompile>
13+
<ClCompile Include="..\..\..\..\src\background_thread.c">
14+
<Filter>Source Files</Filter>
15+
</ClCompile>
1316
<ClCompile Include="..\..\..\..\src\base.c">
1417
<Filter>Source Files</Filter>
1518
</ClCompile>
@@ -34,15 +37,24 @@
3437
<ClCompile Include="..\..\..\..\src\hash.c">
3538
<Filter>Source Files</Filter>
3639
</ClCompile>
40+
<ClCompile Include="..\..\..\..\src\hooks.c">
41+
<Filter>Source Files</Filter>
42+
</ClCompile>
3743
<ClCompile Include="..\..\..\..\src\jemalloc.c">
3844
<Filter>Source Files</Filter>
3945
</ClCompile>
4046
<ClCompile Include="..\..\..\..\src\large.c">
4147
<Filter>Source Files</Filter>
4248
</ClCompile>
49+
<ClCompile Include="..\..\..\..\src\malloc_io.c">
50+
<Filter>Source Files</Filter>
51+
</ClCompile>
4352
<ClCompile Include="..\..\..\..\src\mutex.c">
4453
<Filter>Source Files</Filter>
4554
</ClCompile>
55+
<ClCompile Include="..\..\..\..\src\mutex_pool.c">
56+
<Filter>Source Files</Filter>
57+
</ClCompile>
4658
<ClCompile Include="..\..\..\..\src\nstime.c">
4759
<Filter>Source Files</Filter>
4860
</ClCompile>
@@ -64,6 +76,9 @@
6476
<ClCompile Include="..\..\..\..\src\stats.c">
6577
<Filter>Source Files</Filter>
6678
</ClCompile>
79+
<ClCompile Include="..\..\..\..\src\sz.c">
80+
<Filter>Source Files</Filter>
81+
</ClCompile>
6782
<ClCompile Include="..\..\..\..\src\tcache.c">
6883
<Filter>Source Files</Filter>
6984
</ClCompile>
@@ -76,11 +91,5 @@
7691
<ClCompile Include="..\..\..\..\src\witness.c">
7792
<Filter>Source Files</Filter>
7893
</ClCompile>
79-
<ClCompile Include="..\..\..\..\src\hooks.c">
80-
<Filter>Source Files</Filter>
81-
</ClCompile>
82-
<ClCompile Include="..\..\..\..\src\malloc_io.c">
83-
<Filter>Source Files</Filter>
84-
</ClCompile>
8594
</ItemGroup>
8695
</Project>

0 commit comments

Comments
 (0)