diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-10-29 15:06:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-10-29 15:06:34 -0500 |
| commit | 474c0dba59a4466c1d4ba99572db0aa42cecddca (patch) | |
| tree | f0b98a68844022e2c6a792235d9f175130a6a3c9 | |
| parent | 93f89329001c4111ee2b591bb662b5dee2d66edc (diff) | |
| parent | 4eec9dd54eb469157509048bc5ca9ac3693a8d18 (diff) | |
merge
| -rw-r--r-- | indra/cmake/LLPrimitive.cmake | 9 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index fae1ef2a51..dd55bbfc50 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -11,13 +11,14 @@ set(LLPRIMITIVE_INCLUDE_DIRS ) if (WINDOWS) - set(LLPRIMITIVE_LIBRARIES - llprimitive + set(LLPRIMITIVE_LIBRARIES + debug llprimitive + optimized llprimtive debug libcollada14dom21-d - debug libboost_filesystem-d - debug libboost_system-d optimized libcollada14dom21 + debug libboost_filesystem-d optimized libboost_filesystem + debug libboost_system-d optimized libboost_system ) else (WINDOWS) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 0997c80e46..2b4a2dfdb0 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1270,7 +1270,6 @@ if (WINDOWS) ${DINPUT_LIBRARY} ${DXGUID_LIBRARY} kernel32 - libboost_system odbc32 odbccp32 ole32 |