diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-04-08 17:12:26 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-04-08 17:12:26 -0400 |
| commit | d490081fe29adabfd3a2dba81f5e65d90db3fb51 (patch) | |
| tree | 69f68819a8ac3e3118f8a01e5a0faf949ed203a4 /indra | |
| parent | 9e232094a91254a05b7caa74a0ccac23aa69439f (diff) | |
changes for newer collada build
Diffstat (limited to 'indra')
| -rwxr-xr-x[-rw-r--r--] | indra/cmake/Copy3rdPartyLibs.cmake | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/cmake/LLPrimitive.cmake | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/CMakeLists.txt | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index a301a8d6ba..d4c478c3c7 100644..100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -39,7 +39,7 @@ if(WINDOWS) libapriconv-1.dll
ssleay32.dll
libeay32.dll
- libcollada14dom21-d.dll
+ libcollada14dom22-d.dll
glod.dll
)
@@ -51,7 +51,7 @@ if(WINDOWS) libapriconv-1.dll
ssleay32.dll
libeay32.dll
- libcollada14dom21.dll
+ libcollada14dom22.dll
glod.dll
)
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index 4bdbfe46e2..4d6a84b29e 100644..100755 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -14,8 +14,8 @@ if (WINDOWS) set(LLPRIMITIVE_LIBRARIES debug llprimitive optimized llprimitive - debug libcollada14dom21-d - optimized libcollada14dom21 + debug libcollada14dom22-d + optimized libcollada14dom22 debug libboost_filesystem-d optimized libboost_filesystem debug libboost_system-d diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3ed10c08ab..d70f3ec337 100644..100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1489,9 +1489,9 @@ if (WINDOWS) ${SHARED_LIB_STAGING_DIR}/Release/glod.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/glod.dll ${SHARED_LIB_STAGING_DIR}/Debug/glod.dll - ${SHARED_LIB_STAGING_DIR}/Release/libcollada14dom21.dll - ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libcollada14dom21.dll - ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom21-d.dll + ${SHARED_LIB_STAGING_DIR}/Release/libcollada14dom22.dll + ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/libcollada14dom22.dll + ${SHARED_LIB_STAGING_DIR}/Debug/libcollada14dom22-d.dll ${SHARED_LIB_STAGING_DIR}/Release/openjpeg.dll ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/openjpeg.dll ${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll |