Ansariel
|
68e5f326b3
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# .gitignore
# indra/cmake/00-Common.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/GLEXT.cmake
# indra/cmake/LLCommon.cmake
# indra/cmake/LLMath.cmake
# indra/cmake/LLRender.cmake
# indra/cmake/Tracy.cmake
# indra/llprimitive/CMakeLists.txt
# indra/llrender/llglheaders.h
# indra/llrender/llglslshader.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llface.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llxmlrpctransaction.cpp
|
2023-03-31 18:54:16 +02:00 |
|
Nicky
|
3f31d0b5a7
|
Be more explicit: Rename use_conan_binary to use_system_binary, this will allow us to reuse the macro for more than just conan.
|
2022-07-17 17:51:25 +02:00 |
|
Brad Kittenbrink
|
6b85705951
|
fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed glext.h
|
2022-06-23 22:53:36 -07:00 |
|
Nicky
|
2b151e0aef
|
Round one to support conan for 3P packages, this allows to build the viewer on Linux again.
|
2022-04-18 18:11:43 +02:00 |
|
Nicky
|
4934b65298
|
Cleanup
|
2022-04-16 19:51:02 +02:00 |
|
Nicky
|
d3521b4462
|
Remove obsolete and unmaintained USE_SYSTEMLIBS
|
2022-04-13 10:28:46 +02:00 |
|
Nat Goodspeed
|
e7324c8956
|
DRTVWR-418: Use correct spelling for glh_linear package.
|
2016-11-22 08:39:31 -05:00 |
|
Oz Linden
|
062c13364b
|
don't include glext on Mac where it is not used
|
2014-12-15 12:57:56 -05:00 |
|
callum_linden
|
c519fd3314
|
Updates to point to lots of new third party libs and some small tweaks to take account of minor name changes
|
2014-10-07 17:35:39 -07:00 |
|
Oz Linden
|
776aadf4ef
|
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS
|
2014-03-19 17:30:07 -04:00 |
|
Don Kjer
|
c9ab9590aa
|
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
|
2012-10-04 03:12:48 +00:00 |