diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-02 14:29:42 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-02 14:29:42 -0800 |
| commit | 66efd3f43248c7db6b5a832ed5a293eeb1f98957 (patch) | |
| tree | 9cbc9ac2f40efee40704e255daf749b860cbdf6f /indra | |
| parent | d79af12e04e182bab639e64e9cd1181d5c799582 (diff) | |
fix windows build break again
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 6 | ||||
| -rw-r--r-- | 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 c10fa63049..d1ab264a41 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 3a11753683..583c1e589b 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 |