diff options
| author | Armin Weatherwax | 2010-06-17 11:15:54 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 15:42:39 +0200 |
| commit | c4891694b7c8fcc469dfa057ebf397ee28fc44b1 (patch) | |
| tree | 75d1ea097989c8f54c89bd0a1b5da9bac0e74db9 /linden/indra/newview | |
| parent | update llplugin to latest version of SG2, pull latest webkit (diff) | |
| download | meta-impy-c4891694b7c8fcc469dfa057ebf397ee28fc44b1.zip meta-impy-c4891694b7c8fcc469dfa057ebf397ee28fc44b1.tar.gz meta-impy-c4891694b7c8fcc469dfa057ebf397ee28fc44b1.tar.bz2 meta-impy-c4891694b7c8fcc469dfa057ebf397ee28fc44b1.tar.xz | |
Robin Cornelius: fixes for building plugins on Linux 64bit
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 75ba977..e0c6c61 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
| @@ -1472,10 +1472,12 @@ if (DARWIN) | |||
| 1472 | --build=${CMAKE_CURRENT_BINARY_DIR} | 1472 | --build=${CMAKE_CURRENT_BINARY_DIR} |
| 1473 | --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app | 1473 | --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app |
| 1474 | --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched | 1474 | --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched |
| 1475 | |||
| 1475 | DEPENDS | 1476 | DEPENDS |
| 1476 | ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py | 1477 | ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py |
| 1477 | ) | 1478 | ) |
| 1478 | 1479 | ||
| 1480 | add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit) | ||
| 1479 | add_custom_command( | 1481 | add_custom_command( |
| 1480 | TARGET package POST_BUILD | 1482 | TARGET package POST_BUILD |
| 1481 | COMMAND ${PYTHON_EXECUTABLE} | 1483 | COMMAND ${PYTHON_EXECUTABLE} |