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

successful build with llphysicsextensions stub

master
Oz Linden 2012-07-05 09:39:21 -04:00
parent 1cad2d9de2
commit 21ee5f8d41
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -1158,11 +1158,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ea98ebb0babcf7018bf5c10996be178a</string>
<string>75b3266c3d51b6ae767158969a20a324</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120704.tar.bz2</string>
<string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_source-0.2-darwin-20120705.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -1186,11 +1186,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>eb016d162ac4714ebdfc3331ce080827</string>
<string>5e6db8ede04aeda9f508fe31df6500c9</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120704.tar.bz2</string>
<string>file:////Users/oz/Work/llphysicsextensions-src/llphysicsextensions_stub-0.2-darwin-20120705.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>

2
indra/cmake/LLPhysicsExtensions.cmake
View File

@ -15,10 +15,12 @@ if (HAVOK)
include(Havok)
use_prebuilt_binary(llphysicsextensions_source)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensions)
else (HAVOK)
use_prebuilt_binary(llphysicsextensions_stub)
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
set(LLPHYSICSEXTENSIONS_LIBRARIES llphysicsextensionsstub)
endif (HAVOK)

1
indra/newview/CMakeLists.txt
View File

@ -1820,6 +1820,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${CRYPTO_LIBRARIES}
${LLLOGIN_LIBRARIES}
${LLPHYSICS_LIBRARIES}
${LLPHYSICSEXTENSIONS_LIBRARIES}
${TCMALLOC_LIBRARIES}
)