Skip to content
Snippets Groups Projects
Commit e858c172 authored by Don Kjer's avatar Don Kjer
Browse files

Updating to newer build of tcmalloc/google perf tools. Removing X11 library...

Updating to newer build of tcmalloc/google perf tools.  Removing X11 library dependencies from headless libraries
parent 00302076
No related branches found
No related tags found
No related merge requests found
...@@ -843,6 +843,42 @@ ...@@ -843,6 +843,42 @@
</map> </map>
</map> </map>
</map> </map>
<key>gperftools</key>
<map>
<key>license</key>
<string>bsd</string>
<key>license_file</key>
<string>LICENSES/gperftools.txt</string>
<key>name</key>
<string>gperftools</string>
<key>platforms</key>
<map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>8aedfdcf670348c18a9991ae1b384a61</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/Linux/installer/gperftools-2.0-linux-20120727.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>f62841804acb91e1309603a84f3f0ce8</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/CYGWIN/installer/gperftools-2.0-windows-20120727.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
</map>
<key>gstreamer</key> <key>gstreamer</key>
<map> <map>
<key>license</key> <key>license</key>
...@@ -1781,42 +1817,6 @@ ...@@ -1781,42 +1817,6 @@
</map> </map>
</map> </map>
</map> </map>
<key>tcmalloc</key>
<map>
<key>license</key>
<string>bsd</string>
<key>license_file</key>
<string>LICENSES/google-perftools.txt</string>
<key>name</key>
<string>tcmalloc</string>
<key>platforms</key>
<map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>dde928cb24d22a267004a8c17669ba65</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226426/arch/Linux/installer/google_perftools-1.7-linux-20110412.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
</map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>8308f7bd68bb7083655753b7abe7225f</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/226287/arch/CYGWIN/installer/google_perftools-1.7-windows-20110411.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
</map>
<key>tut</key> <key>tut</key>
<map> <map>
<key>license</key> <key>license</key>
......
...@@ -10,7 +10,7 @@ if (STANDALONE) ...@@ -10,7 +10,7 @@ if (STANDALONE)
else (STANDALONE) else (STANDALONE)
if (WINDOWS) if (WINDOWS)
if (USE_TCMALLOC) if (USE_TCMALLOC)
use_prebuilt_binary(tcmalloc) use_prebuilt_binary(gperftools)
set(TCMALLOC_LIBRARIES set(TCMALLOC_LIBRARIES
debug libtcmalloc_minimal-debug debug libtcmalloc_minimal-debug
optimized libtcmalloc_minimal) optimized libtcmalloc_minimal)
...@@ -23,7 +23,7 @@ else (STANDALONE) ...@@ -23,7 +23,7 @@ else (STANDALONE)
endif (WINDOWS) endif (WINDOWS)
if (LINUX) if (LINUX)
if (USE_TCMALLOC) if (USE_TCMALLOC)
use_prebuilt_binary(tcmalloc) use_prebuilt_binary(gperftools)
set(TCMALLOC_LIBRARIES set(TCMALLOC_LIBRARIES
tcmalloc) tcmalloc)
else (USE_TCMALLOC) else (USE_TCMALLOC)
......
...@@ -85,7 +85,6 @@ if (LINUX) ...@@ -85,7 +85,6 @@ if (LINUX)
${LLVFS_LIBRARIES} ${LLVFS_LIBRARIES}
${LLWINDOW_HEADLESS_LIBRARIES} ${LLWINDOW_HEADLESS_LIBRARIES}
${LLXML_LIBRARIES} ${LLXML_LIBRARIES}
${UI_LIBRARIES} # for GTK
fontconfig # For FCInit and other FC* functions. fontconfig # For FCInit and other FC* functions.
) )
endif (BUILD_HEADLESS) endif (BUILD_HEADLESS)
......
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