diff options
| author | rustyx <me@rustyx.org> | 2016-04-12 09:50:10 +0200 |
|---|---|---|
| committer | rustyx <me@rustyx.org> | 2016-04-12 09:50:10 +0200 |
| commit | bc26d7d99b3d3dc7633a28da622087ed3daa9a94 (patch) | |
| tree | 8446f9678bf43047859405e8f2fbcdf61f9d0a7c /msvc | |
| parent | e7642715ac535cf88585d4e5ca191c8042cc2399 (diff) | |
| download | platform_external_jemalloc_new-bc26d7d99b3d3dc7633a28da622087ed3daa9a94.tar.gz platform_external_jemalloc_new-bc26d7d99b3d3dc7633a28da622087ed3daa9a94.tar.bz2 platform_external_jemalloc_new-bc26d7d99b3d3dc7633a28da622087ed3daa9a94.zip | |
Cleanup MSVC project, embed PDB data inside static .lib
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/projects/vc2015/jemalloc/jemalloc.vcxproj | 22 | ||||
| -rw-r--r-- | msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters | 3 |
2 files changed, 11 insertions, 14 deletions
diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj index 0a6c4e61..9315022d 100644 --- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj +++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj @@ -106,7 +106,6 @@ <ClCompile Include="..\..\..\..\src\mutex.c" /> <ClCompile Include="..\..\..\..\src\nstime.c" /> <ClCompile Include="..\..\..\..\src\pages.c" /> - <ClCompile Include="..\..\..\..\src\ph.c" /> <ClCompile Include="..\..\..\..\src\prng.c" /> <ClCompile Include="..\..\..\..\src\prof.c" /> <ClCompile Include="..\..\..\..\src\quarantine.c" /> @@ -252,7 +251,7 @@ <Optimization>Disabled</Optimization> <PreprocessorDefinitions>_REENTRANT;_WINDLL;DLLEXPORT;JEMALLOC_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4090;4146;4244;4267;4334</DisableSpecificWarnings> + <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> </ClCompile> <Link> @@ -269,7 +268,7 @@ <PreprocessorDefinitions>JEMALLOC_DEBUG;_REENTRANT;JEMALLOC_EXPORT=;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DisableSpecificWarnings>4090;4146;4244;4267;4334</DisableSpecificWarnings> + <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> </ClCompile> <Link> @@ -285,7 +284,7 @@ <Optimization>Disabled</Optimization> <PreprocessorDefinitions>_REENTRANT;_WINDLL;DLLEXPORT;JEMALLOC_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4090;4146;4244;4267;4334</DisableSpecificWarnings> + <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> </ClCompile> <Link> @@ -302,8 +301,9 @@ <PreprocessorDefinitions>JEMALLOC_DEBUG;_REENTRANT;JEMALLOC_EXPORT=;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <DisableSpecificWarnings>4090;4146;4244;4267;4334</DisableSpecificWarnings> - <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> + <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> + <DebugInformationFormat>OldStyle</DebugInformationFormat> + <MinimalRebuild>false</MinimalRebuild> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -320,7 +320,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>_REENTRANT;_WINDLL;DLLEXPORT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>4090;4146;4244;4267;4334</DisableSpecificWarnings> + <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> </ClCompile> <Link> @@ -341,7 +341,7 @@ <PreprocessorDefinitions>_REENTRANT;JEMALLOC_EXPORT=;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DisableSpecificWarnings>4090;4146;4244;4267;4334</DisableSpecificWarnings> + <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> </ClCompile> <Link> @@ -361,7 +361,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_REENTRANT;_WINDLL;DLLEXPORT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DisableSpecificWarnings>4090;4146;4244;4267;4334</DisableSpecificWarnings> + <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> </ClCompile> <Link> @@ -382,8 +382,8 @@ <PreprocessorDefinitions>_REENTRANT;JEMALLOC_EXPORT=;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <DisableSpecificWarnings>4090;4146;4244;4267;4334</DisableSpecificWarnings> - <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> + <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> + <DebugInformationFormat>OldStyle</DebugInformationFormat> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters index 412c24d6..88c15efa 100644 --- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters +++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters @@ -229,9 +229,6 @@ <ClCompile Include="..\..\..\..\src\pages.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\ph.c"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\..\..\src\prng.c"> <Filter>Source Files</Filter> </ClCompile> |