diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-10-23 20:27:05 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-10-23 20:27:05 +0300 |
| commit | 5591515f193a1ae3ec0dfcee4020636e529af859 (patch) | |
| tree | 7a0078763dc9c5edbe9367a619077b3ec9d5a906 | |
| parent | 5f50a2a2a11195ca6404ef65e1511e834034a1bb (diff) | |
MAC build fix
| -rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 5 | ||||
| -rw-r--r-- | indra/llwindow/lldxhardware.h | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 119cbebc81..3c34fd269e 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -36,6 +36,11 @@ #include <boost/regex.hpp> +#if LL_WINDOWS +// because something pulls in window and lldxdiag dependencies which in turn need wbemuuid.lib + #pragma comment(lib, "wbemuuid.lib") +#endif + // namespace LLExperienceCache // { diff --git a/indra/llwindow/lldxhardware.h b/indra/llwindow/lldxhardware.h index 6be3a3bef3..1cb687e3b6 100644 --- a/indra/llwindow/lldxhardware.h +++ b/indra/llwindow/lldxhardware.h @@ -33,8 +33,6 @@ #include "llstring.h" #include "llsd.h" -# pragma comment(lib, "wbemuuid.lib") - class LLVersion { public: diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 7539d147ae..d3067456fa 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -61,7 +61,9 @@ #include "llallocator.h" #include "llcalc.h" #include "llconversationlog.h" +#if LL_WINDOWS #include "lldxhardware.h" +#endif #include "lltexturestats.h" #include "lltrace.h" #include "lltracethreadrecorder.h" |