From 66efd3f43248c7db6b5a832ed5a293eeb1f98957 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Tue, 2 Mar 2010 14:29:42 -0800
Subject: [PATCH] fix windows build break again
---
indra/cmake/LLCommon.cmake | 6 +-----
indra/llcommon/lluuid.cpp | 2 ++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index c10fa630498..d1ab264a413 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -13,11 +13,7 @@ set(LLCOMMON_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
)
-if (WINDOWS)
- set(LLCOMMON_LIBRARIES llcommon iphlpapi)
-else (WINDOWS)
- set(LLCOMMON_LIBRARIES llcommon)
-endif (WINDOWS)
+set(LLCOMMON_LIBRARIES llcommon)
add_definitions(${TCMALLOC_FLAG})
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index 3a11753683b..583c1e589b4 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -36,6 +36,8 @@
#undef WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <windows.h>
+// ugh, this is ugly. We need to straighten out our linking for this library
+#pragma comment(lib, "IPHLPAPI.lib")
#include <iphlpapi.h>
#endif
--
GitLab