livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated colladadom.

master
Dave Parks 2010-10-14 11:26:59 -05:00
parent 1259e05edc
commit c0d882fbff
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -38,7 +38,7 @@ if(WINDOWS)
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
libcollada14dom21.dll
libcollada14dom21-d.dll
glod.dll
)

7
indra/cmake/LLPrimitive.cmake
View File

@ -13,7 +13,12 @@ set(LLPRIMITIVE_INCLUDE_DIRS
if (WINDOWS)
set(LLPRIMITIVE_LIBRARIES
llprimitive
libcollada14dom21
debug libcollada14dom21-d
debug libboost_filesystem-d
debug libboost_system-d
optimized libcollada14dom21
optimized libboost_filesystem
optimized libboost_system
)
else (WINDOWS)
set(LLPRIMITIVE_LIBRARIES

3
indra/newview/CMakeLists.txt
View File

@ -1498,6 +1498,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/openjpeg.dll
${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/openjpeg.dll
${SHARED_LIB_STAGING_DIR}/Debug/openjpegd.dll

4
install.xml
View File

@ -280,9 +280,9 @@
<key>windows</key>
<map>
<key>md5sum</key>
<string>6c2267ba2735bb5bc6229bc4366fce86</string>
<string>b4adc36b1476c125f1ee5681a6bc5e1e</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1.1-windows-20100129.tar.bz2</uri>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-windows-20101014a.tar.bz2</uri>
</map>
</map>
</map>