Skip to content
Snippets Groups Projects
Commit 3fd8bc04 authored by Brad Linden's avatar Brad Linden
Browse files

Upgraded tracy package and enabled for mac with USE_TRACY for work on mac perfomance SL-18563

```
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110561/960415/tracy-v0.7.8.578230-darwin64-578230.tar.bz2" hash="70f31fa71ecb52bd092da52e27c3ff8c"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110562/960424/tracy-v0.7.8.578230-windows-578230.tar.bz2" hash="1dc33422939adf015db85e96c5a8276e"
autobuild installables edit "tracy" url="https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110563/960429/tracy-v0.7.8.578230-windows64-578230.tar.bz2" hash="fcc6ecece2ecb65aa36500dfa9461fb3"
```
parent c5c511b8
No related branches found
No related tags found
2 merge requests!3Update to main branch,!2Rebase onto current main branch
...@@ -2569,9 +2569,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -2569,9 +2569,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>da7317e4a81609f624f84780f28b07de</string> <string>70f31fa71ecb52bd092da52e27c3ff8c</string>
<key>url</key> <key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/86972/801630/tracy-v0.7.8.563351-darwin64-563351.tar.bz2</string> <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110561/960415/tracy-v0.7.8.578230-darwin64-578230.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>darwin64</string> <string>darwin64</string>
...@@ -2581,11 +2581,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -2581,11 +2581,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>47c696cd2966c5cc3c8ba6115dd1f886</string> <string>1dc33422939adf015db85e96c5a8276e</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>md5</string> <string>md5</string>
<key>url</key> <key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/86973/801641/tracy-v0.7.8.563351-windows-563351.tar.bz2</string> <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110562/960424/tracy-v0.7.8.578230-windows-578230.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
...@@ -2595,11 +2595,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -2595,11 +2595,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>dff3dd1db6a4cb0b73f60a5db3ee0de2</string> <string>fcc6ecece2ecb65aa36500dfa9461fb3</string>
<key>hash_algorithm</key> <key>hash_algorithm</key>
<string>md5</string> <string>md5</string>
<key>url</key> <key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/100101/882119/tracy-v0.8.1.571983-windows64-571983.tar.bz2</string> <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/110563/960429/tracy-v0.7.8.578230-windows64-578230.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows64</string> <string>windows64</string>
...@@ -2610,7 +2610,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -2610,7 +2610,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>source_type</key> <key>source_type</key>
<string>git</string> <string>git</string>
<key>version</key> <key>version</key>
<string>v0.7.8.563351</string> <string>v0.7.8.578230</string>
</map> </map>
<key>tut</key> <key>tut</key>
<map> <map>
......
...@@ -34,6 +34,7 @@ else (LINUX) ...@@ -34,6 +34,7 @@ else (LINUX)
${BOOST_CONTEXT_LIBRARY} ${BOOST_CONTEXT_LIBRARY}
${BOOST_THREAD_LIBRARY} ${BOOST_THREAD_LIBRARY}
${BOOST_SYSTEM_LIBRARY} ${BOOST_SYSTEM_LIBRARY}
${TRACY_LIBRARY}
) )
endif (LINUX) endif (LINUX)
......
...@@ -17,6 +17,7 @@ if (USE_TRACY) ...@@ -17,6 +17,7 @@ if (USE_TRACY)
if (DARWIN) if (DARWIN)
MESSAGE(STATUS "Including Tracy for Darwin: '${TRACY_INCLUDE_DIR}'") MESSAGE(STATUS "Including Tracy for Darwin: '${TRACY_INCLUDE_DIR}'")
set(TRACY_LIBRARY "tracy")
endif (DARWIN) endif (DARWIN)
if (LINUX) if (LINUX)
......
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