Skip to content
Snippets Groups Projects
Commit 5f872761 authored by Nyx (Neal Orman)'s avatar Nyx (Neal Orman)
Browse files

no longer using tcmalloc-minimal, replacing cmake config to refer to

full build version.
parent 235a4477
No related branches found
No related tags found
No related merge requests found
...@@ -56,8 +56,8 @@ if(WINDOWS) ...@@ -56,8 +56,8 @@ if(WINDOWS)
) )
if(USE_GOOGLE_PERFTOOLS) if(USE_GOOGLE_PERFTOOLS)
set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll) set(debug_files ${debug_files} libtcmalloc-debug.dll)
set(release_files ${release_files} libtcmalloc_minimal.dll) set(release_files ${release_files} libtcmalloc.dll)
endif(USE_GOOGLE_PERFTOOLS) endif(USE_GOOGLE_PERFTOOLS)
if (FMOD) if (FMOD)
...@@ -262,7 +262,7 @@ elseif(LINUX) ...@@ -262,7 +262,7 @@ elseif(LINUX)
libopenal.so libopenal.so
libopenjpeg.so libopenjpeg.so
libssl.so libssl.so
libtcmalloc_minimal.so libtcmalloc.so
libuuid.so.16 libuuid.so.16
libuuid.so.16.0.22 libuuid.so.16.0.22
libssl.so.0.9.8 libssl.so.0.9.8
......
...@@ -7,14 +7,14 @@ else (STANDALONE) ...@@ -7,14 +7,14 @@ else (STANDALONE)
if (WINDOWS) if (WINDOWS)
use_prebuilt_binary(tcmalloc) use_prebuilt_binary(tcmalloc)
set(TCMALLOC_LIBRARIES set(TCMALLOC_LIBRARIES
debug libtcmalloc_minimal-debug debug libtcmalloc-debug
optimized libtcmalloc_minimal) optimized libtcmalloc)
set(GOOGLE_PERFTOOLS_FOUND "YES") set(GOOGLE_PERFTOOLS_FOUND "YES")
endif (WINDOWS) endif (WINDOWS)
if (LINUX) if (LINUX)
use_prebuilt_binary(tcmalloc) use_prebuilt_binary(tcmalloc)
set(TCMALLOC_LIBRARIES set(TCMALLOC_LIBRARIES
tcmalloc_minimal) tcmalloc)
set(PROFILER_LIBRARIES profiler) set(PROFILER_LIBRARIES profiler)
set(GOOGLE_PERFTOOLS_INCLUDE_DIR set(GOOGLE_PERFTOOLS_INCLUDE_DIR
${LIBS_PREBUILT_DIR}/include) ${LIBS_PREBUILT_DIR}/include)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment