diff options
author | prep linden <prep@lindenlab.com> | 2011-04-15 10:48:13 -0400 |
---|---|---|
committer | prep linden <prep@lindenlab.com> | 2011-04-15 10:48:13 -0400 |
commit | 2851141ee64f628077cbd44b97e7b3514795d248 (patch) | |
tree | bf749eddcfbe4fbbaf32533b9e99eb3ba8ac2acd /indra/cmake/LLPrimitive.cmake | |
parent | fcfb70f01d46e5a7f7716c81ce7ad9667a99e3ed (diff) | |
parent | 88ae509ed957226531611486415ee33082d6d4dd (diff) |
merge
Diffstat (limited to 'indra/cmake/LLPrimitive.cmake')
-rwxr-xr-x | indra/cmake/LLPrimitive.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 4d6a84b29e..b860a09de9 100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -9,17 +9,16 @@ use_prebuilt_binary(libxml) set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive ) - if (WINDOWS) set(LLPRIMITIVE_LIBRARIES debug llprimitive optimized llprimitive debug libcollada14dom22-d optimized libcollada14dom22 - debug libboost_filesystem-d - optimized libboost_filesystem - debug libboost_system-d - optimized libboost_system + debug libboost_filesystem-vc100-mt-gd-1_45 + optimized libboost_filesystem-vc100-mt-1_45 + debug libboost_system-vc100-mt-gd-1_45 + optimized libboost_system-vc100-mt-1_45 ) else (WINDOWS) set(LLPRIMITIVE_LIBRARIES |