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

PATH-181 and PATH-194: Starting to put back the ability to build the viewer using the stub libraries.

master
Todd Stinson 2012-01-26 14:06:57 -08:00
parent ee1a6c9afd
commit 1c14b08456
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
indra/cmake/LLPhysicsExtensions.cmake
View File

@ -1,31 +1,25 @@
# -*- cmake -*-
include(Prebuilt)
use_prebuilt_binary(llphysicsextensions)
set(LLPHYSICS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/lib/include)
set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug)
set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release)
if (INSTALL_PROPRIETARY AND NOT STANDALONE)
use_prebuilt_binary(llphysicsextensions)
find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
set(LLPHYSICS_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug)
set(LLPHYSICS_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release)
set(LLPHYSICS_LIBRARIES
find_library(LL_PHYSICS_DEBUG_LIB llphysicsextensions PATHS ${LLPHYSICS_DEBUG_LIBRARY_PATH})
find_library(LL_PHYSICS_RELEASE_LIB llphysicsextensions PATHS ${LLPHYSICS_RELEASE_LIBRARY_PATH})
debug ${LL_PHYSICS_DEBUG_LIB}
optimized ${LL_PHYSICS_RELEASE_LIB}
)
if (LINUX)
list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group)
list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group)
endif (LINUX)
# if (INSTALL_PROPRIETARY AND NOT STANDALONE)
# use_prebuilt_binary(llconvexdecomposition)
# set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition)
# else (INSTALL_PROPRIETARY AND NOT STANDALONE)
# use_prebuilt_binary(llconvexdecompositionstub)
# set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub)
# endif (INSTALL_PROPRIETARY AND NOT STANDALONE)
set(LLPHYSICS_LIBRARIES
debug ${LL_PHYSICS_DEBUG_LIB}
optimized ${LL_PHYSICS_RELEASE_LIB}
)
if (LINUX)
list(INSERT LLPHYSICS_LIBRARIES 0 -Wl,--start-group)
list(APPEND LLPHYSICS_LIBRARIES -Wl,--end-group)
endif (LINUX)
else (INSTALL_PROPRIETARY AND NOT STANDALONE)
endif (INSTALL_PROPRIETARY AND NOT STANDALONE)