diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-19 10:11:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-19 10:11:29 -0400 |
| commit | ddd5659f815a39e9a8ef0e86c911fea75a7d8848 (patch) | |
| tree | cfccad35552a7aa72b57ce965e3a8e5ec5e5ef4a /indra/linux_crash_logger | |
| parent | ed2b5da8f1eb51e747f6d9f5a4fc535cbf7e69d9 (diff) | |
| parent | be1bb8d76dd33bf331cadeb817a89eb2940ac578 (diff) | |
merge changes for DRTVWR-294
Diffstat (limited to 'indra/linux_crash_logger')
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/linux_crash_logger.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/llcrashloggerlinux.cpp | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/linux_crash_logger/llcrashloggerlinux.h | 0 |
4 files changed, 3 insertions, 0 deletions
diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt index e0d0c9fc69..41b92b00e0 100644..100755 --- a/indra/linux_crash_logger/CMakeLists.txt +++ b/indra/linux_crash_logger/CMakeLists.txt @@ -12,6 +12,7 @@ include(LLVFS) include(LLXML) include(Linking) include(UI) +include(FreeType) include_directories( ${LLCOMMON_INCLUDE_DIRS} @@ -19,6 +20,7 @@ include_directories( ${LLMATH_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} + ${FREETYPE_INCLUDE_DIRS} ) include_directories(SYSTEM ${LLCOMMON_SYSTEM_INCLUDE_DIRS} @@ -57,6 +59,7 @@ target_link_libraries(linux-crash-logger ${LLCOMMON_LIBRARIES} ${UI_LIBRARIES} ${DB_LIBRARIES} + ${FREETYPE_LIBRARIES} ) add_custom_target(linux-crash-logger-target ALL diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 99d0ad7e14..99d0ad7e14 100644..100755 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp index 62465f9937..62465f9937 100644..100755 --- a/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp diff --git a/indra/linux_crash_logger/llcrashloggerlinux.h b/indra/linux_crash_logger/llcrashloggerlinux.h index dae6c46651..dae6c46651 100644..100755 --- a/indra/linux_crash_logger/llcrashloggerlinux.h +++ b/indra/linux_crash_logger/llcrashloggerlinux.h |